wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 829175 - Allow reentering JM code if Ion was compiled for a different OSR point, r=dvander.

Browse Source
This commit is contained in:
Brian Hackett 2013-01-10 14:18:40 -07:00
parent 4a18b30019
commit 55949198c6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -937,7 +937,7 @@ MakeJITScript(JSContext *cx, HandleScript script)
}
static inline bool
IonGetsFirstChance(JSContext *cx, JSScript *script, CompileRequest request)
IonGetsFirstChance(JSContext *cx, JSScript *script, jsbytecode *pc, CompileRequest request)
{
#ifdef JS_ION
if (!ion::IsEnabled(cx))
@ -960,6 +960,11 @@ IonGetsFirstChance(JSContext *cx, JSScript *script, CompileRequest request)
if (script->hasIonScript() && script->ion->bailoutExpected())
return false;
// If we cannot enter Ion because it was compiled for OSR at a different PC,
// let JM take over until the PC is reached.
if (script->hasIonScript() && pc && script->ionScript()->osrPc() != pc)
return false;
// If ion compilation is pending or in progress on another thread, continue
// using JM until that compilation finishes.
if (script->ion == ION_COMPILING_SCRIPT)
@ -998,7 +1003,7 @@ mjit::CanMethodJIT(JSContext *cx, HandleScript script, jsbytecode *pc,
return Compile_Skipped;
}
if (IonGetsFirstChance(cx, script, request))
if (IonGetsFirstChance(cx, script, pc, request))
return Compile_Skipped;
if (script->hasMJITInfo()) {