Fix --disable-methodjit bustage (no bug, r=red)
authorLuke Wagner <luke@mozilla.com>
Tue, 10 Apr 2012 14:57:15 -0700
changeset 94673 d54571be3d38c972b0fa2ab27ca1133f3a02c970
parent 94672 1664d00a1d242878c8e214db86a45c483e29b6fa
child 94674 c90cb1ef7d1295dcb5973d8aa7a2a836c1aece57
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersred
milestone14.0a1
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
Fix --disable-methodjit bustage (no bug, r=red)
js/src/jsanalyze.cpp
--- a/js/src/jsanalyze.cpp
+++ b/js/src/jsanalyze.cpp
@@ -1945,23 +1945,25 @@ ScriptAnalysis::needsArgsObj(NeedsArgsOb
         return needsArgsObj(state, SSAValue::PhiValue(use->offset, use->u.phi));
 
     jsbytecode *pc = script->code + use->offset;
     JSOp op = JSOp(*pc);
 
     if (op == JSOP_POP || op == JSOP_POPN)
         return false;
 
+#ifdef JS_METHODJIT
     /* SplatApplyArgs can read fp->canonicalActualArg(i) directly. */
     if (state.canOptimizeApply && op == JSOP_FUNAPPLY && GET_ARGC(pc) == 2 && use->u.which == 0) {
         JS_ASSERT(mjit::IsLowerableFunCallOrApply(pc));
         state.haveOptimizedApply = true;
         state.canOptimizeApply = false;
         return false;
     }
+#endif
 
     /* arguments[i] can read fp->canonicalActualArg(i) directly. */
     if (!state.haveOptimizedApply && op == JSOP_GETELEM && use->u.which == 1) {
         state.canOptimizeApply = false;
         return false;
     }
 
     /* arguments.length length can read fp->numActualArgs() directly. */