Bug 1357799 - Enable the diagnostic assert during the beta staged roll out period r=bholley a=gchang
☠☠ backed out by 84360b114045 ☠ ☠
authorSylvestre Ledru <sledru@mozilla.com>
Wed, 19 Apr 2017 18:07:04 +0200
changeset 395977 89318a1e562bca3d9c17987335f66f4c260cd6cd
parent 395976 713a6c2a6b15fad388e8a291709879ca56646be6
child 395978 dd92c1f26a0897917b2277139079fde65e66bc14
push id1468
push userasasaki@mozilla.com
push dateMon, 05 Jun 2017 19:31:07 +0000
treeherdermozilla-release@0641fc6ee9d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbholley, gchang
bugs1357799
milestone54.0
Bug 1357799 - Enable the diagnostic assert during the beta staged roll out period r=bholley a=gchang 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.