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 664159 - Fix eval-in-frame crash (r=waldo)

Browse Source
This commit is contained in:
Luke Wagner 2011-06-14 17:35:19 -07:00
parent b35106fd7e
commit 66e44f1e46
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jit-test/tests/basic/testStackIterDebug.js
View File

@ -50,3 +50,13 @@ function assertStackIs(s1) {
(function f() { var o = { toString:function() { evalInFrame(1, "assertStackIs(['eval-code', f, 'global-code'])"); }}; [o,o].sort() })();
(function f() { var o = { toString:function() { evalInFrame(1, "assertStackIs(['eval-code', f, 'global-code'])", true); }}; [o,o].sort() })();
function inner() {
(function puppies() {
evalInFrame(1, "assertStackIs(['eval-code', inner, String.prototype.replace, outer, String.prototype.replace, 'global-code'])");
})();
}
function outer() {
"bbb".replace(/b/g, inner);
}
"aaa".replace(/a/g, outer);

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

@ -287,6 +287,12 @@ StackSegment::pushCall(CallArgsList &callList)
calls_ = &callList;
}
void
StackSegment::pointAtCall(CallArgsList &callList)
{
calls_ = &callList;
}
void
StackSegment::popCall()
{
@ -647,7 +653,7 @@ ContextStack::pushExecuteFrame(JSContext *cx, JSScript *script, const Value &thi
/* pushRegs() below links the prev-frame; manually link the prev-call. */
if (evalInFrame && evalInFrameCalls)
seg_->pushCall(*evalInFrameCalls);
seg_->pointAtCall(*evalInFrameCalls);
efg->prevRegs_ = seg_->pushRegs(efg->regs_);
JS_ASSERT(space().firstUnused() == efg->regs_.sp);

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

@ -1272,6 +1272,7 @@ class StackSegment
FrameRegs *pushRegs(FrameRegs &regs);
void popRegs(FrameRegs *regs);
void pushCall(CallArgsList &callList);
void pointAtCall(CallArgsList &callList);
void popCall();
/* For jit access: */