Merge backout of FrameState changes.
authorDavid Anderson <danderson@mozilla.com>
Mon, 06 Sep 2010 18:26:57 -0700
changeset 74567 ca32ed513371555a77ee4ecad6e4987310d10d1a
parent 74566 dca27a8bc82fc871cd2c54f0c149408ca424dae7 (current diff)
parent 74550 a813aec8cc75ae79fbb5c8e6c273cae5e3489795 (diff)
child 74568 5492e0774e89b6f960847d1c5307c99164141501
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
milestone2.0b6pre
Merge backout of FrameState changes.
js/src/methodjit/Compiler.cpp
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -1889,17 +1889,17 @@ void
 mjit::Compiler::inlineCallHelper(uint32 argc, bool callingNew)
 {
     /* Check for interrupts on function call */
     interruptCheckHelper();
 
     FrameEntry *fe = frame.peek(-int(argc + 2));
 
     /* Currently, we don't support constant functions. */
-    if (fe->isNotType(JSVAL_TYPE_OBJECT) || script->debugMode || fe->isConstant()) {
+    if (fe->isConstant() || fe->isNotType(JSVAL_TYPE_OBJECT) || script->debugMode) {
         emitUncachedCall(argc, callingNew);
         return;
     }
 
 #ifdef JS_MONOIC
     FrameEntry *thisvFe = frame.peek(-int(argc + 1));
     Address thisvAddr = frame.addressOf(thisvFe);