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

Don't attempt to invalidate frames from within an invalidation bailout. (bug 734022, r=jandem)

Browse Source
This commit is contained in:
Marty Rosenberg 2012-03-08 06:13:47 -08:00
parent f095c332fa
commit 8688514845
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/src/ion/Bailouts.cpp
View File

@ -456,20 +456,23 @@ ion::InvalidationBailout(InvalidationBailoutStack *sp, size_t *frameSizeOut)
IonSpew(IonSpew_Invalidate, " new ra %p", (void *) frame->returnAddress());
}
// If invalidation was triggered inside a stub call, we may still have to
// monitor the result, since the bailout happens before the MMonitorTypes
// instruction is executed.
jsbytecode *pc = activation->bailout()->bailoutPc();
if (js_CodeSpec[*pc].format & JOF_TYPESET)
types::TypeScript::Monitor(cx, cx->fp()->script(), pc, cx->regs().sp[-1]);
in.ionScript()->decref(cx);
if (cx->runtime->hasIonReturnOverride())
cx->regs().sp[-1] = cx->runtime->takeIonReturnOverride();
if (retval != BAILOUT_RETURN_FATAL_ERROR)
if (retval != BAILOUT_RETURN_FATAL_ERROR) {
// If invalidation was triggered inside a stub call, we may still have to
// monitor the result, since the bailout happens before the MMonitorTypes
// instruction is executed.
jsbytecode *pc = activation->bailout()->bailoutPc();
if (js_CodeSpec[*pc].format & JOF_TYPESET) {
JS_ASSERT(retval == BAILOUT_RETURN_OK);
return BAILOUT_RETURN_MONITOR;
}
return retval;
}
cx->delete_(activation->maybeTakeBailout());
return BAILOUT_RETURN_FATAL_ERROR;
@ -507,9 +510,6 @@ ion::ReflowTypeInfo(uint32 bailoutResult)
JSScript *script = cx->fp()->script();
jsbytecode *pc = activation->bailout()->bailoutPc();
JS_ASSERT(script->hasAnalysis());
JS_ASSERT(script->analysis()->ranInference());
JS_ASSERT(js_CodeSpec[*pc].format & JOF_TYPESET);
IonSpew(IonSpew_Bailouts, "reflowing type info at %s:%d pcoff %d", script->filename,