Backed out changeset 8837ebfb3045 - wrong bug number.
authorKannan Vijayan <kvijayan@mozilla.com>
Mon, 16 Jul 2012 15:33:51 -0400
changeset 104935 e113d9f1b1ce83b20fe216e8adcd310eec4391c9
parent 104934 d685dfe6eb7b33e510542dcdc1f2ef439bfd8d17
child 104936 f955e442c2af16e9f4bc2915384a3718b3a79839
push id1490
push userakeybl@mozilla.com
push dateMon, 08 Oct 2012 18:29:50 +0000
treeherdermozilla-beta@f335e7dacdc1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone17.0a1
backs out8837ebfb30459ee3600f0744d950bc06ff390a04
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
Backed out changeset 8837ebfb3045 - wrong bug number.
js/src/jsinterp.cpp
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -2450,31 +2450,31 @@ BEGIN_CASE(JSOP_FUNCALL)
         DO_NEXT_OP(len);
     }
 
     if (!TypeMonitorCall(cx, args, construct))
         goto error;
 
     InitialFrameFlags initial = construct ? INITIAL_CONSTRUCT : INITIAL_NONE;
 
-    bool newType = cx->typeInferenceEnabled() && UseNewType(cx, script, regs.pc);
-
     JSScript *newScript = fun->script();
 
     if (newScript->compileAndGo && newScript->hasClearedGlobal()) {
         JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CLEARED_SCOPE);
         goto error;
     }
 
     if (!cx->stack.pushInlineFrame(cx, regs, args, *fun, newScript, initial))
         goto error;
 
     SET_SCRIPT(regs.fp()->script());
     RESET_USE_METHODJIT();
 
+    bool newType = cx->typeInferenceEnabled() && UseNewType(cx, script, regs.pc);
+
 #ifdef JS_METHODJIT
     if (!newType) {
         /* Try to ensure methods are method JIT'd.  */
         mjit::CompileStatus status = mjit::CanMethodJIT(cx, script, script->code,
                                                         construct,
                                                         mjit::CompileRequest_Interpreter,
                                                         regs.fp());
         if (status == mjit::Compile_Error)