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 939614: IonMonkey: Fix trying to enter at wrong pc, r=jandem

Browse Source
This commit is contained in:
Brian Hackett 2013-12-18 22:36:17 +01:00
parent cbd5fe5cd0
commit c7719761bc
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/jit/BaselineIC.cpp
View File

@ -801,6 +801,7 @@ EnsureCanEnterIon(JSContext *cx, ICUseCount_Fallback *stub, BaselineFrame *frame
if (isLoopEntry) { if (isLoopEntry) {
IonScript *ion = script->ionScript(); IonScript *ion = script->ionScript();
JS_ASSERT(cx->runtime()->spsProfiler.enabled() == ion->hasSPSInstrumentation()); JS_ASSERT(cx->runtime()->spsProfiler.enabled() == ion->hasSPSInstrumentation());
JS_ASSERT(ion->osrPc() == pc);
// If the baseline frame's SPS handling doesn't match up with the Ion code's SPS // If the baseline frame's SPS handling doesn't match up with the Ion code's SPS
// handling, don't OSR. // handling, don't OSR.

7
js/src/jit/Ion.cpp
View File

@ -1967,7 +1967,12 @@ Compile(JSContext *cx, HandleScript script, BaselineFrame *osrFrame, jsbytecode
} }
// Compilation succeeded or we invalidated right away or an inlining/alloc abort // Compilation succeeded or we invalidated right away or an inlining/alloc abort
return HasIonScript(script, executionMode) ? Method_Compiled : Method_Skipped; if (HasIonScript(script, executionMode)) {
if (osrPc && script->ionScript()->osrPc() != osrPc)
return Method_Skipped;
return Method_Compiled;
}
return Method_Skipped;
} }
} // namespace jit } // namespace jit