Backed out changeset c8e5a0703821 (bug 1283395) for bustage on a CLOS…

…ED TREE
iaxat · Jul 21, 2016 · a6408ce · a6408ce
1 parent a227097
commit a6408ce
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 50 deletions.
diff --git a/mfbt/Assertions.h b/mfbt/Assertions.h
@@ -17,7 +17,6 @@
 #include "mozilla/Compiler.h"
 #include "mozilla/Likely.h"
 #include "mozilla/MacroArgs.h"
-#include "mozilla/StaticAnalysisFunctions.h"
 #ifdef MOZ_DUMP_ASSERTION_STACK
 #include "nsTraceRefcnt.h"
 #endif
@@ -369,7 +368,7 @@ struct AssertionConditionType
 #define MOZ_ASSERT_HELPER1(expr) \
   do { \
     MOZ_VALIDATE_ASSERT_CONDITION_TYPE(expr); \
-    if (MOZ_UNLIKELY(!MOZ_CHECK_ASSERT_ASSIGNMENT(expr))) { \
+    if (MOZ_UNLIKELY(!(expr))) { \
       MOZ_ReportAssertionFailure(#expr, __FILE__, __LINE__); \
       MOZ_CRASH_ANNOTATE("MOZ_RELEASE_ASSERT(" #expr ")"); \
       MOZ_REALLY_CRASH(); \
@@ -379,7 +378,7 @@ struct AssertionConditionType
 #define MOZ_ASSERT_HELPER2(expr, explain) \
   do { \
     MOZ_VALIDATE_ASSERT_CONDITION_TYPE(expr); \
-    if (MOZ_UNLIKELY(!MOZ_CHECK_ASSERT_ASSIGNMENT(expr))) { \
+    if (MOZ_UNLIKELY(!(expr))) { \
       MOZ_ReportAssertionFailure(#expr " (" explain ")", __FILE__, __LINE__); \
       MOZ_CRASH_ANNOTATE("MOZ_RELEASE_ASSERT(" #expr ") (" explain ")"); \
       MOZ_REALLY_CRASH(); \

diff --git a/mfbt/StaticAnalysisFunctions.h b/mfbt/StaticAnalysisFunctions.h
diff --git a/mfbt/moz.build b/mfbt/moz.build
@@ -84,7 +84,6 @@ EXPORTS.mozilla = [
     'SizePrintfMacros.h',
     'Snprintf.h',
     'SplayTree.h',
-    'StaticAnalysisFunctions.h',
     'TaggedAnonymousMemory.h',
     'TemplateLib.h',
     'ThreadLocal.h',