From b89cb6ae18b99f7a0200340ac4df62e931f69d16 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 7 Jan 2022 21:24:44 +0000
Subject: [PATCH] Bug 1748969 - Move definition of
 MOZ_DIAGNOSTIC_ASSERT_ENABLED to configure. r=emilio

Original patch by emilio.

Differential Revision: https://phabricator.services.mozilla.com/D135321
---
 mfbt/Assertions.h | 3 +--
 moz.configure     | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mfbt/Assertions.h b/mfbt/Assertions.h
index f7062fa20f85..a84eeae5aa62 100644
--- a/mfbt/Assertions.h
+++ b/mfbt/Assertions.h
@@ -427,12 +427,11 @@ struct AssertionConditionType {
     } while (false)
 #endif /* DEBUG */
 
-#if defined(EARLY_BETA_OR_EARLIER) || defined(DEBUG)
+#if defined(MOZ_DIAGNOSTIC_ASSERT_ENABLED)
 #  define MOZ_DIAGNOSTIC_ASSERT(...)                                    \
     MOZ_ASSERT_GLUE(                                                    \
         MOZ_PASTE_PREFIX_AND_ARG_COUNT(MOZ_ASSERT_HELPER, __VA_ARGS__), \
         ("MOZ_DIAGNOSTIC_ASSERT", __VA_ARGS__))
-#  define MOZ_DIAGNOSTIC_ASSERT_ENABLED 1
 #else
 #  define MOZ_DIAGNOSTIC_ASSERT(...) \
     do {                             \
diff --git a/moz.configure b/moz.configure
index 985c3f9a7909..5285ca4e0264 100755
--- a/moz.configure
+++ b/moz.configure
@@ -137,6 +137,12 @@ set_define("MOZ_DEBUG", moz_debug)
 # down to old-configure.
 add_old_configure_assignment("MOZ_DEBUG", depends("--enable-debug")(lambda x: bool(x)))
 
+set_define(
+    "MOZ_DIAGNOSTIC_ASSERT_ENABLED",
+    True,
+    when=moz_debug | milestone.is_early_beta_or_earlier,
+)
+
 option(
     "--with-debug-label",
     nargs="+",