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
This commit is contained in:
Mike Hommey 2022-01-07 21:24:44 +00:00
parent fa1a339437
commit b89cb6ae18
2 changed files with 7 additions and 2 deletions

View file

@ -427,12 +427,11 @@ struct AssertionConditionType {
} while (false) } while (false)
#endif /* DEBUG */ #endif /* DEBUG */
#if defined(EARLY_BETA_OR_EARLIER) || defined(DEBUG) #if defined(MOZ_DIAGNOSTIC_ASSERT_ENABLED)
# define MOZ_DIAGNOSTIC_ASSERT(...) \ # define MOZ_DIAGNOSTIC_ASSERT(...) \
MOZ_ASSERT_GLUE( \ MOZ_ASSERT_GLUE( \
MOZ_PASTE_PREFIX_AND_ARG_COUNT(MOZ_ASSERT_HELPER, __VA_ARGS__), \ MOZ_PASTE_PREFIX_AND_ARG_COUNT(MOZ_ASSERT_HELPER, __VA_ARGS__), \
("MOZ_DIAGNOSTIC_ASSERT", __VA_ARGS__)) ("MOZ_DIAGNOSTIC_ASSERT", __VA_ARGS__))
# define MOZ_DIAGNOSTIC_ASSERT_ENABLED 1
#else #else
# define MOZ_DIAGNOSTIC_ASSERT(...) \ # define MOZ_DIAGNOSTIC_ASSERT(...) \
do { \ do { \

View file

@ -137,6 +137,12 @@ set_define("MOZ_DEBUG", moz_debug)
# down to old-configure. # down to old-configure.
add_old_configure_assignment("MOZ_DEBUG", depends("--enable-debug")(lambda x: bool(x))) 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( option(
"--with-debug-label", "--with-debug-label",
nargs="+", nargs="+",