Bug 605415: re-enable MICs on ARM. (r=cdleary)

js/src/configure.in

@@ -2612,6 +2612,7 @@ arm*-*)
     ENABLE_TRACEJIT=1
     NANOJIT_ARCH=ARM
     ENABLE_METHODJIT=1
+    ENABLE_MONOIC=1
     AC_DEFINE(JS_CPU_ARM)
     AC_DEFINE(JS_NUNBOX32)
     ;;

js/src/methodjit/Compiler.cpp

@@ -61,7 +61,7 @@
 
 using namespace js;
 using namespace js::mjit;
-#if defined JS_POLYIC
+#if defined(JS_POLYIC) || defined(JS_MONOIC)
 using namespace js::mjit::ic;
 #endif
 

js/src/methodjit/MonoIC.h

@@ -116,7 +116,7 @@ struct TraceICInfo {
     bool hasSlowTraceHint : 1;
 };
 
-static const uint16 BAD_TRACEIC_INDEX = (uint16_t)-1;
+static const uint16 BAD_TRACEIC_INDEX = (uint16)0xffff;
 
 void JS_FASTCALL GetGlobalName(VMFrame &f, ic::MICInfo *ic);
 void JS_FASTCALL SetGlobalName(VMFrame &f, ic::MICInfo *ic);
@@ -135,7 +135,7 @@ struct EqualityICInfo {
 
     bool generated : 1;
     JSC::MacroAssembler::RegisterID tempReg : 5;
-    Assembler::Condition cond : 6;
+    Assembler::Condition cond;
 };
 
 JSBool JS_FASTCALL Equality(VMFrame &f, ic::EqualityICInfo *ic);