Bug 1357799 - Enable the diagnostic assert during the beta staged roll out period r=bholley
authorSylvestre Ledru <sledru@mozilla.com>
Wed, 19 Apr 2017 18:07:04 +0200
changeset 353965 19ea645f562ef7e33af09ddd8d2b8a9381eeb855
parent 353964 aa3ee3f6de39bee04df4a16f93affca7f235421b
child 353966 79d38eed0b7371e97a725e66d48992692535f482
push id31683
push usercbook@mozilla.com
push dateThu, 20 Apr 2017 09:11:32 +0000
treeherdermozilla-central@20325547884a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbholley
bugs1357799
milestone55.0a1
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
Bug 1357799 - Enable the diagnostic assert during the beta staged roll out period r=bholley MozReview-Commit-ID: KstUhJH0bAz
mfbt/Assertions.h
--- a/mfbt/Assertions.h
+++ b/mfbt/Assertions.h
@@ -439,17 +439,17 @@ struct AssertionConditionType
     (__VA_ARGS__))
 
 #ifdef DEBUG
 #  define MOZ_ASSERT(...) MOZ_RELEASE_ASSERT(__VA_ARGS__)
 #else
 #  define MOZ_ASSERT(...) do { } while (0)
 #endif /* DEBUG */
 
-#ifdef RELEASE_OR_BETA
+#if defined(RELEASE_OR_BETA) && !defined(EARLY_BETA_OR_EARLIER)
 #  define MOZ_DIAGNOSTIC_ASSERT MOZ_ASSERT
 #else
 #  define MOZ_DIAGNOSTIC_ASSERT MOZ_RELEASE_ASSERT
 #endif
 
 /*
  * MOZ_ASSERT_IF(cond1, cond2) is equivalent to MOZ_ASSERT(cond2) if cond1 is
  * true.