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

[INFER] Only allow inlined frames to call other frames in the same VMFrame, bug 673763.

Browse Source
This commit is contained in:
Brian Hackett 2011-07-25 08:57:00 -07:00
parent 062072fa23
commit 1c29d97da1
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/methodjit/InvokeHelpers.cpp
View File

@ -359,7 +359,18 @@ UncachedInlineCall(VMFrame &f, InitialFrameFlags initial,
}
}
/* Otherwise, run newscript in the interpreter. */
/*
* Otherwise, run newscript in the interpreter. Expand any inlined frame we
* are calling from, as the new frame is not associated with the VMFrame
* and will not have its prevpc info updated if frame expansion is
* triggered while interpreting.
*/
if (f.regs.inlined()) {
ExpandInlineFrames(cx->compartment, false);
JS_ASSERT(!f.regs.inlined());
regs.fp()->resetInlinePrev(f.fp(), f.regs.pc);
}
bool ok = !!Interpret(cx, cx->fp());
f.cx->stack.popInlineFrame(regs);

11
js/src/vm/Stack.cpp
View File

@ -572,7 +572,16 @@ ContextStack::ensureOnTop(JSContext *cx, MaybeReportError report, uintN nvars,
{
Value *firstUnused = space().firstUnused();
if (onTop() && extend && (!cx->hasfp() || !cx->regs().inlined())) {
#ifdef JS_METHODJIT
/*
* The only calls made by inlined methodjit frames can be to other JIT
* frames associated with the same VMFrame.
*/
if (cx->hasfp() && cx->regs().inlined())
mjit::ExpandInlineFrames(cx->compartment, false);
#endif
if (onTop() && extend) {
if (!space().ensureSpace(cx, report, firstUnused, nvars))
return NULL;
return firstUnused;

2
js/src/vm/Stack.h
View File

@ -540,6 +540,8 @@ class StackFrame
*
* - Inlined frames have the same scope chain as the outer frame.
* - Inlined frames have the same strictness as the outer frame.
* - Inlined frames can only make calls to other JIT frames associated with
* the same VMFrame. Other calls force expansion of the inlined frames.
*/
/*