Bug 898653 - Quell 'not enough parameters for macro' warnings in MSVC. r=djvj
authorTill Schneidereit <till@tillschneidereit.net>
Sat, 27 Jul 2013 13:05:36 +0200
changeset 153614 752a6805b83bc446dbbe72bff7872dbd341b9783
parent 153613 7c3cb4883157edf13a0ef2fc20d8d9b5c3e47a58
child 153615 ec3a5e429ea2c029cb92f4845e828afdea099745
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdjvj
bugs898653
milestone25.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 898653 - Quell 'not enough parameters for macro' warnings in MSVC. r=djvj
js/src/assembler/wtf/Assertions.h
js/src/ion/IonCaches.cpp
mfbt/decimal/moz-decimal-utils.h
--- a/js/src/assembler/wtf/Assertions.h
+++ b/js/src/assembler/wtf/Assertions.h
@@ -39,13 +39,13 @@
 
 #ifndef ASSERT
 #define ASSERT(assertion) MOZ_ASSERT(assertion)
 #endif
 #define ASSERT_UNUSED(variable, assertion) do { \
     (void)variable; \
     ASSERT(assertion); \
 } while (0)
-#define ASSERT_NOT_REACHED() MOZ_ASSUME_UNREACHABLE()
+#define ASSERT_NOT_REACHED() MOZ_ASSUME_UNREACHABLE("wtf/Assertions.h")
 #define CRASH() MOZ_CRASH()
 #define COMPILE_ASSERT(exp, name) static_assert(exp, #name)
 
 #endif /* assembler_wtf_Assertions_h */
--- a/js/src/ion/IonCaches.cpp
+++ b/js/src/ion/IonCaches.cpp
@@ -3014,17 +3014,17 @@ IsCacheableScopeChain(JSObject *scopeCha
 
         scopeChain = &scopeChain->as<ScopeObject>().enclosingScope();
         if (!scopeChain) {
             IonSpew(IonSpew_InlineCaches, "Scope chain indirect hit");
             return false;
         }
     }
 
-    MOZ_ASSUME_UNREACHABLE();
+    MOZ_ASSUME_UNREACHABLE("Invalid scope chain");
 }
 
 JSObject *
 BindNameIC::update(JSContext *cx, size_t cacheIndex, HandleObject scopeChain)
 {
     AutoFlushCache afc ("BindNameCache");
 
     IonScript *ion = GetTopIonJSScript(cx)->ionScript();
--- a/mfbt/decimal/moz-decimal-utils.h
+++ b/mfbt/decimal/moz-decimal-utils.h
@@ -27,17 +27,17 @@
 #define UINT64_C(c) (c ## ULL)
 #endif
 
 #ifdef ASSERT
 #undef ASSERT
 #endif
 #define ASSERT MOZ_ASSERT
 
-#define ASSERT_NOT_REACHED() MOZ_ASSUME_UNREACHABLE()
+#define ASSERT_NOT_REACHED() MOZ_ASSUME_UNREACHABLE("moz-decimal-utils.h")
 
 #define WTF_MAKE_NONCOPYABLE(ClassName) \
   private: \
     ClassName(const ClassName&) MOZ_DELETE; \
     void operator=(const ClassName&) MOZ_DELETE;
 
 #if defined(_MSC_VER)
 namespace std {