Backed out changeset df0ddb9c9bef (bug 1368079) for making DevEdition fail to build
authorPhil Ringnalda <philringnalda@gmail.com>
Tue, 30 May 2017 23:10:48 -0700
changeset 409525 925230851743b9a969a3142f00aea5014a33cb02
parent 409524 9a5c710587f9e64bf044602d5e988b152ef4f40c
child 409526 06d83f260f410f125847e95618b6f8b9e83e9a2f
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1368079
milestone55.0a1
backs outdf0ddb9c9befc73c6ee4c446087016f7597d2316
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset df0ddb9c9bef (bug 1368079) for making DevEdition fail to build MozReview-Commit-ID: BUE6UL0WiDW
mfbt/Assertions.h
--- a/mfbt/Assertions.h
+++ b/mfbt/Assertions.h
@@ -442,24 +442,24 @@ struct AssertionConditionType
     (__VA_ARGS__))
 
 #ifdef DEBUG
 #  define MOZ_ASSERT(...) MOZ_RELEASE_ASSERT(__VA_ARGS__)
 #else
 #  define MOZ_ASSERT(...) do { } while (0)
 #endif /* DEBUG */
 
-#if defined(NIGHTLY_BUILD) || defined(MOZ_DEV_EDITION)
-#  define MOZ_DIAGNOSTIC_ASSERT MOZ_RELEASE_ASSERT
-#  define MOZ_DIAGNOSTIC_ASSERT_ENABLED 1
-#else // RELEASE_OR_BETA
+#ifdef RELEASE_OR_BETA
 #  define MOZ_DIAGNOSTIC_ASSERT MOZ_ASSERT
 #  ifdef DEBUG
 #    define MOZ_DIAGNOSTIC_ASSERT_ENABLED 1
 #  endif
+#else
+#  define MOZ_DIAGNOSTIC_ASSERT MOZ_RELEASE_ASSERT
+#  define MOZ_DIAGNOSTIC_ASSERT_ENABLED 1
 #endif
 
 /*
  * MOZ_ASSERT_IF(cond1, cond2) is equivalent to MOZ_ASSERT(cond2) if cond1 is
  * true.
  *
  *   MOZ_ASSERT_IF(isPrime(num), num == 2 || isOdd(num));
  *