Back out 2ce3daef5bd2.
authorSean Stangl <sstangl@mozilla.com>
Tue, 07 Feb 2012 13:07:17 -0800
changeset 112659 1192928a418339284513e8ff086889f7707f4d12
parent 112658 a64af142c43a12b7a264a884dd935e7678ccdad2
child 112660 1c5fcda56a007734d0da6ca23f984e748e575001
push id239
push userakeybl@mozilla.com
push dateThu, 03 Jan 2013 21:54:43 +0000
treeherdermozilla-release@3a7b66445659 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone13.0a1
backs out2ce3daef5bd23296dbc85c3764e3fd04f534c0fb
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
Back out 2ce3daef5bd2.
js/src/ion/LIR-Common.h
js/src/ion/Lowering.cpp
--- a/js/src/ion/LIR-Common.h
+++ b/js/src/ion/LIR-Common.h
@@ -308,17 +308,17 @@ class LCallGeneric : public LCallInstruc
         return getTemp(0)->output();
     }
     const LAllocation *getTempObject() {
         return getTemp(1)->output();
     }
 };
 
 // Generates a monomorphic callsite for a known, native target.
-class LCallNative : public LCallInstructionHelper<BOX_PIECES, 0, 4>
+class LCallNative : public LCallInstructionHelper<BOX_PIECES, 0, 4> // FIXME: How many really?
 {
     JSFunction *function_;
     uint32 argslot_;
 
   public:
     LIR_HEADER(CallNative);
 
     LCallNative(JSFunction *function, uint32 argslot,
--- a/js/src/ion/Lowering.cpp
+++ b/js/src/ion/Lowering.cpp
@@ -167,19 +167,19 @@ CheckKnownCallee(MDefinition *func)
 }
 
 bool
 LIRGenerator::visitCall(MCall *call)
 {
     uint32 argc = call->argc();
     JS_ASSERT(call->getFunction()->type() == MIRType_Object);
 
-    JS_ASSERT(CallTempReg0 != CallTempReg1);
-    JS_ASSERT(CallTempReg0 != ArgumentsRectifierReg);
-    JS_ASSERT(CallTempReg1 != ArgumentsRectifierReg);
+    JS_STATIC_ASSERT(CallTempReg0 != CallTempReg1);
+    JS_STATIC_ASSERT(CallTempReg0 != ArgumentsRectifierReg);
+    JS_STATIC_ASSERT(CallTempReg1 != ArgumentsRectifierReg);
 
     // Height of the current argument vector.
     uint32 argslot = getArgumentSlotForCall();
 
     // If the callsite is known-monomorphic (calls an MConstant),
     // extract the target function.
     JSFunction *target = CheckKnownCallee(call->getFunction());