Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 817475 - JM: Remove re-compilation loop. r=bhackett

Browse Source
This commit is contained in:
Nicolas B. Pierron 2012-12-02 20:47:54 -08:00
parent aa9120552c
commit d86334b1c5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jsinfer.cpp
View File

@ -2541,6 +2541,8 @@ TypeCompartment::nukeTypes(FreeOp *fop)
# endif
}
#endif /* JS_METHODJIT */
pendingNukeTypes = false;
}
void

10
js/src/methodjit/Compiler.cpp
View File

@ -991,8 +991,9 @@ CompileStatus
mjit::CanMethodJIT(JSContext *cx, JSScript *scriptArg, jsbytecode *pc,
bool construct, CompileRequest request, StackFrame *frame)
{
bool compiledOnce = false;
RootedScript script(cx, scriptArg);
restart:
checkOutput:
if (!cx->methodJitEnabled)
return Compile_Abort;
@ -1057,7 +1058,7 @@ mjit::CanMethodJIT(JSContext *cx, JSScript *scriptArg, jsbytecode *pc,
FreeOp *fop = cx->runtime->defaultFreeOp();
jit->destroy(fop);
fop->free_(jit);
goto restart;
return Compile_Skipped;
}
jith->setValid(jit);
@ -1083,6 +1084,8 @@ mjit::CanMethodJIT(JSContext *cx, JSScript *scriptArg, jsbytecode *pc,
if (desc.chunk)
return Compile_Okay;
if (compiledOnce)
return Compile_Skipped;
if (!cx->hasRunOption(JSOPTION_METHODJIT_ALWAYS) &&
++desc.counter <= INFER_USES_BEFORE_COMPILE)
@ -1110,7 +1113,8 @@ mjit::CanMethodJIT(JSContext *cx, JSScript *scriptArg, jsbytecode *pc,
* Compiling a script can occasionally trigger its own recompilation,
* so go back through the compilation logic.
*/
goto restart;
compiledOnce = true;
goto checkOutput;
}
/* Non-OOM errors should have an associated exception. */