From 621285316dbc70e315d2a25bc95f81be0bf64d63 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 6 Jan 2013 13:45:56 +0100
Subject: [PATCH] No bug - Fix four warnings in js/src; r=sparky

---
 js/src/gc/RootMarking.cpp | 3 ++-
 js/src/ion/LIR.cpp        | 2 +-
 js/src/jsapi.cpp          | 2 +-
 js/src/vm/SelfHosting.cpp | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index f2142e7ec801..271d34ada51b 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -6,6 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/Attributes.h"
+#include "mozilla/DebugOnly.h"
 #include "mozilla/Util.h"
 
 #include "jsapi.h"
@@ -534,7 +535,7 @@ AutoGCRooter::trace(JSTracer *trc)
       case OBJOBJHASHMAP: {
         AutoObjectObjectHashMap::HashMapImpl &map = static_cast<AutoObjectObjectHashMap *>(this)->map;
         for (AutoObjectObjectHashMap::Enum e(map); !e.empty(); e.popFront()) {
-            RawObject key = e.front().key;
+            mozilla::DebugOnly<RawObject> key = e.front().key;
             MarkObjectRoot(trc, (RawObject *) &e.front().key, "AutoObjectObjectHashMap key");
             JS_ASSERT(key == e.front().key);
             MarkObjectRoot(trc, &e.front().value, "AutoObjectObjectHashMap value");
diff --git a/js/src/ion/LIR.cpp b/js/src/ion/LIR.cpp
index 56eadb8a4b27..09b4c54cd634 100644
--- a/js/src/ion/LIR.cpp
+++ b/js/src/ion/LIR.cpp
@@ -212,6 +212,7 @@ PrintDefinition(FILE *fp, const LDefinition &def)
     fprintf(fp, "]");
 }
 
+#ifdef DEBUG
 static void
 PrintUse(char *buf, size_t size, const LUse *use)
 {
@@ -231,7 +232,6 @@ PrintUse(char *buf, size_t size, const LUse *use)
     }
 }
 
-#ifdef DEBUG
 const char *
 LAllocation::toString() const
 {
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 75e0348dd3d6..0474c4027285 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -887,8 +887,8 @@ JSRuntime::JSRuntime(JSUseHelperThreads useHelperThreads)
     ionActivation(NULL),
     ionPcScriptCache(NULL),
     threadPool(this),
-    ionReturnOverride_(MagicValue(JS_ARG_POISON)),
     ctypesActivityCallback(NULL),
+    ionReturnOverride_(MagicValue(JS_ARG_POISON)),
     useHelperThreads_(useHelperThreads),
     requestedHelperThreadCount(-1)
 {
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index be2e8dd6ca88..c84c1f5a00aa 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -110,9 +110,9 @@ intrinsic_ThrowError(JSContext *cx, unsigned argc, Value *vp)
 static JSBool
 intrinsic_AssertionFailed(JSContext *cx, unsigned argc, Value *vp)
 {
-    CallArgs args = CallArgsFromVp(argc, vp);
 #ifdef DEBUG
-    if (argc > 0) {
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length() > 0) {
         // try to dump the informative string
         JSString *str = ToString(cx, args[0]);
         if (str) {