From e3c965eb6ffa58b8bf8f5f87ac545046908c3329 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Mon, 5 Jun 2017 23:47:02 +0200
Subject: [PATCH] Bug 1368079 - Enable the diagnostic assert when
 MOZ_DEV_EDITION is set r=froydnj,glandium

MozReview-Commit-ID: Dxi5jTGcrow

--HG--
extra : rebase_source : 959956094e6e64a50e307e48b11bb8791940d297
---
 mfbt/Assertions.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mfbt/Assertions.h b/mfbt/Assertions.h
index bf1a0e534d21..4c9cac259355 100644
--- a/mfbt/Assertions.h
+++ b/mfbt/Assertions.h
@@ -446,14 +446,14 @@ struct AssertionConditionType
 #  define MOZ_ASSERT(...) do { } while (0)
 #endif /* DEBUG */
 
-#ifdef RELEASE_OR_BETA
+#if defined(NIGHTLY_BUILD) || defined(MOZ_DEV_EDITION)
+#  define MOZ_DIAGNOSTIC_ASSERT MOZ_RELEASE_ASSERT
+#  define MOZ_DIAGNOSTIC_ASSERT_ENABLED 1
+#else
 #  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
 
 /*