Bug 898936 - Fix some build warnings on ARM gcc; r=mjrosenb

js/src/jit/BacktrackingAllocator.cpp

@@ -1189,7 +1189,7 @@ BacktrackingAllocator::dumpLiveness()
         LBlock *block = graph.getBlock(blockIndex);
         MBasicBlock *mir = block->mir();
 
-        printf("\nBlock %lu", blockIndex);
+        printf("\nBlock %lu", static_cast<unsigned long>(blockIndex));
         for (size_t i = 0; i < mir->numSuccessors(); i++)
             printf(" [successor %u]", mir->getSuccessor(i)->id());
         printf("\n");
@@ -1234,7 +1234,7 @@ BacktrackingAllocator::dumpLiveness()
         printf("reg %s: %s\n", AnyRegister::FromCode(i).name(), IntervalString(fixedIntervals[i]));
 
     for (size_t i = 0; i < graph.numVirtualRegisters(); i++) {
-        printf("v%lu:", i);
+        printf("v%lu:", static_cast<unsigned long>(i));
         VirtualRegister &vreg = vregs[i];
         for (size_t j = 0; j < vreg.numIntervals(); j++) {
             if (j)
@@ -1269,7 +1269,7 @@ BacktrackingAllocator::dumpAllocations()
     printf("Allocations:\n");
 
     for (size_t i = 0; i < graph.numVirtualRegisters(); i++) {
-        printf("v%lu:", i);
+        printf("v%lu:", static_cast<unsigned long>(i));
         VirtualRegister &vreg = vregs[i];
         for (size_t j = 0; j < vreg.numIntervals(); j++) {
             if (j)

js/src/jit/PerfSpewer.cpp

@@ -149,7 +149,7 @@ PerfSpewer::writeProfile(JSScript *script,
         if (size > 0) {
             fprintf(fp_,
                     "%lx %lx %s:%d: Func%02d\n",
-                    reinterpret_cast<uintptr_t>(code->raw()),
+                    reinterpret_cast<unsigned long>(code->raw()),
                     size,
                     script->filename(),
                     script->lineno,
@@ -170,7 +170,8 @@ PerfSpewer::writeProfile(JSScript *script,
             if (cur < blockStart) {
                 fprintf(fp_,
                         "%lx %lx %s:%d: Func%02d-Block?\n",
-                        cur, blockStart - cur,
+                        static_cast<unsigned long>(cur),
+                        static_cast<unsigned long>(blockStart - cur),
                         script->filename(), script->lineno,
                         thisFunctionIndex);
             }
@@ -181,7 +182,7 @@ PerfSpewer::writeProfile(JSScript *script,
             if (size > 0) {
                 fprintf(fp_,
                         "%lx %lx %s:%d:%d: Func%02d-Block%d\n",
-                        blockStart, size,
+                        static_cast<unsigned long>(blockStart), size,
                         r.filename, r.lineNumber, r.columnNumber,
                         thisFunctionIndex, r.id);
             }
@@ -193,7 +194,8 @@ PerfSpewer::writeProfile(JSScript *script,
         if (cur < funcEnd) {
             fprintf(fp_,
                     "%lx %lx %s:%d: Func%02d-OOL\n",
-                    cur, funcEnd - cur,
+                    static_cast<unsigned long>(cur),
+                    static_cast<unsigned long>(funcEnd - cur),
                     script->filename(), script->lineno,
                     thisFunctionIndex);
         }

js/src/jit/RegisterAllocator.cpp

@@ -366,7 +366,7 @@ AllocationIntegrityState::dump()
         LBlock *block = graph.getBlock(blockIndex);
         MBasicBlock *mir = block->mir();
 
-        printf("\nBlock %lu", blockIndex);
+        printf("\nBlock %lu", static_cast<unsigned long>(blockIndex));
         for (size_t i = 0; i < mir->numSuccessors(); i++)
             printf(" [successor %u]", mir->getSuccessor(i)->id());
         printf("\n");

js/src/jit/arm/Assembler-arm.h

@@ -572,7 +572,7 @@ struct RIS
     {
         JS_ASSERT(ShiftAmount == imm);
     }
-    explicit RIS(Reg r) : ShiftAmount(ShiftAmount) { }
+    explicit RIS(Reg r) : ShiftAmount(r.ShiftAmount) {}
 };
 
 struct RRS

js/src/jit/arm/CodeGenerator-arm.cpp

@@ -1040,7 +1040,7 @@ CodeGeneratorARM::visitOutOfLineTableSwitch(OutOfLineTableSwitch *ool)
 {
     MTableSwitch *mir = ool->mir();
 
-    int numCases = mir->numCases();
+    size_t numCases = mir->numCases();
     for (size_t i = 0; i < numCases; i++) {
         LBlock *caseblock = mir->getCase(numCases - 1 - i)->lir();
         Label *caseheader = caseblock->label();

js/src/jit/arm/MacroAssembler-arm.cpp

@@ -3103,10 +3103,7 @@ void
 MacroAssemblerARMCompat::passABIArg(const MoveOperand &from)
 {
     MoveOperand to;
-    uint32_t increment = 1;
-    bool useResolver = true;
     ++passedArgs_;
-    Move::Kind kind = Move::GENERAL;
     if (!enoughMemory_)
         return;
     if (from.isDouble()) {

js/src/jit/shared/IonAssemblerBufferWithConstantPools.h

@@ -52,7 +52,7 @@ struct Pool
 
     Pool(int maxOffset_, int immSize_, int instSize_, int bias_, int alignment_, LifoAlloc &LifoAlloc_,
          bool isBackref_ = false, bool canDedup_ = false, Pool *other_ = NULL)
-        : maxOffset(maxOffset_), immSize(immSize_), instSize(instSize),
+        : maxOffset(maxOffset_), immSize(immSize_), instSize(instSize_),
           bias(bias_), alignment(alignment_),
           isBackref(isBackref_), canDedup(canDedup_), other(other_),
           poolData(static_cast<uint8_t *>(LifoAlloc_.alloc(8*immSize))), numEntries(0),

js/src/jsscript.cpp

@@ -164,7 +164,7 @@ Bindings::clone(JSContext *cx, InternalBindingsHandle self,
     Bindings &src = srcScript->bindings;
     ptrdiff_t off = (uint8_t *)src.bindingArray() - srcScript->data;
     JS_ASSERT(off >= 0);
-    JS_ASSERT(off <= srcScript->dataSize);
+    JS_ASSERT(size_t(off) <= srcScript->dataSize);
     Binding *dstPackedBindings = (Binding *)(dstScriptData + off);
 
     /*