Various warning fixes. No bug, r=themaid

js/src/ion/IonBuilder.cpp

@@ -29,8 +29,8 @@ using mozilla::DebugOnly;
 IonBuilder::IonBuilder(JSContext *cx, TempAllocator *temp, MIRGraph *graph,
                        TypeOracle *oracle, CompileInfo *info, size_t inliningDepth, uint32 loopDepth)
   : MIRGenerator(cx->compartment, temp, graph, info),
-    recompileInfo(cx->compartment->types.compiledInfo),
     backgroundCodegen_(NULL),
+    recompileInfo(cx->compartment->types.compiledInfo),
     cx(cx),
     loopDepth_(loopDepth),
     callerResumePoint_(NULL),

js/src/jsapi-tests/Makefile.in

@@ -32,8 +32,11 @@ CPPSRCS = \
   testDeepFreeze.cpp \
   testDefineGetterSetterNonEnumerable.cpp \
   testDefineProperty.cpp \
+  testEnclosingFunction.cpp \
+  testErrorCopying.cpp \
   testExtendedEq.cpp \
   testExternalStrings.cpp \
+  testFindSCCs.cpp \
   testFuncCallback.cpp \
   testFunctionProperties.cpp \
   testGCOutOfMemory.cpp \
@@ -44,12 +47,14 @@ CPPSRCS = \
   testIntString.cpp \
   testIntTypesABI.cpp \
   testIntern.cpp \
+  testJSEvaluateScript.cpp \
   testLookup.cpp \
   testLooselyEqual.cpp \
   testNewObject.cpp \
   testOps.cpp \
   testOriginPrincipals.cpp \
   testParseJSON.cpp \
+  testProfileStrings.cpp \
   testPropCache.cpp \
   testRegExp.cpp \
   testResolveRecursion.cpp \
@@ -63,11 +68,6 @@ CPPSRCS = \
   testTypedArrays.cpp \
   testVersion.cpp \
   testXDR.cpp \
-  testProfileStrings.cpp \
-  testJSEvaluateScript.cpp \
-  testErrorCopying.cpp \
-  testEnclosingFunction.cpp \
-  testFindSCCs.cpp \
   $(NULL)
 
 # Disabled: an entirely unrelated test seems to cause this to fail.  Moreover,

js/src/jsgc.cpp

@@ -3889,22 +3889,24 @@ RemoveFromGrayList(RawObject wrapper)
     wrapper->setReservedSlot(slot, UndefinedValue());
 
     JSCompartment *c = CrossCompartmentPointerReferent(wrapper)->compartment();
-    RawObject o = c->gcIncomingGrayPointers;
-    if (o == wrapper) {
+    RawObject obj = c->gcIncomingGrayPointers;
+    if (obj == wrapper) {
         c->gcIncomingGrayPointers = tail;
         return true;
     }
 
-    while (o) {
-        unsigned slot = GrayLinkSlot(o);
-        RawObject next = o->getReservedSlot(slot).toObjectOrNull();
+    while (obj) {
+        unsigned slot = GrayLinkSlot(obj);
+        RawObject next = obj->getReservedSlot(slot).toObjectOrNull();
         if (next == wrapper) {
-            o->setCrossCompartmentSlot(slot, ObjectOrNullValue(tail));
+            obj->setCrossCompartmentSlot(slot, ObjectOrNullValue(tail));
             return true;
         }
-        o = next;
+        obj = next;
     }
-    JS_NOT_REACHED();
+
+    JS_NOT_REACHED("object not found in gray link list");
+    return false;
 }
 
 void

js/src/jsopcode.cpp

@@ -6362,7 +6362,8 @@ DecompileArgumentFromStack(JSContext *cx, int formalIndex, char **res)
     if (!pcStack.init(cx, script, current))
         return false;
 
-    uint32_t formalStackIndex = pcStack.depth() - GET_ARGC(current) + formalIndex;
+    int formalStackIndex = pcStack.depth() - GET_ARGC(current) + formalIndex;
+    JS_ASSERT(formalStackIndex >= 0);
     if (formalStackIndex >= pcStack.depth())
         return true;