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

Better fix for recursion and let blocks (bug 547791, r=gal).

Browse Source
This commit is contained in:
David Anderson 2010-02-23 16:14:34 -08:00
parent 06cc81805b
commit c99331c609
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jsbuiltins.cpp
View File

@ -403,6 +403,8 @@ js_PopInterpFrame(JSContext* cx, InterpState* state)
return JS_FALSE;
if (cx->fp->imacpc)
return JS_FALSE;
if (cx->fp->blockChain)
return JS_FALSE;
cx->fp->putActivationObjects(cx);

2
js/src/jsrecursion.cpp
View File

@ -226,7 +226,7 @@ TraceRecorder::upRecursion()
unsigned totalSlots = NativeStackSlots(cx, 1);
unsigned downPostSlots = totalSlots - NativeStackSlots(cx, 0);
FrameInfo* fi = (FrameInfo*)alloca(sizeof(FrameInfo) + totalSlots * sizeof(TraceType));
fi->block = cx->fp->down->blockChain;
fi->block = NULL;
fi->pc = (jsbytecode*)return_pc;
fi->imacpc = NULL;

2
js/src/jstracer.cpp
View File

@ -9723,6 +9723,8 @@ IsTraceableRecursion(JSContext *cx)
return false;
if ((fp->flags & JSFRAME_CONSTRUCTING) || (down->flags & JSFRAME_CONSTRUCTING))
return false;
if (fp->blockChain || down->blockChain)
return false;
if (*fp->script->code != JSOP_TRACE)
return false;
return true;