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 1201575 - Give copied FrameIter::Data the cx of the current frame. (r=jimb)

Browse Source
This commit is contained in:
Shu-yu Guo 2015-09-03 16:55:05 -07:00
parent c6502c45c8
commit 87c0967131
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/jit-test/tests/debug/bug1161332.js Normal file
View File

@ -0,0 +1,16 @@
// |jit-test| error: Error
var g = newGlobal();
g.eval('function f(a) { if (a == 1) debugger; evaluate("f(" + a + " - 1);", {newContext: true}); }');
var N = 2;
var dbg = new Debugger(g);
var frames = [];
dbg.onEnterFrame = function (frame) {
frames.push(frame);
frame.onPop = function () { assertEq(frame.onPop, frame.onPop); };
};
dbg.onDebuggerStatement = function (frame) {
for (var f of frames)
f.eval('a').return;
};
evaluate("g.f(N);");

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

@ -755,6 +755,11 @@ FrameIter::copyData() const
MOZ_ASSERT(data_.state_ != ASMJS);
if (data && data_.jitFrames_.isIonScripted())
data->ionInlineFrameNo_ = ionInlineFrames_.frameNo();
// Give the copied Data the cx of the current activation, which may be
// different than the cx that the current FrameIter was constructed
// with. This ensures that when we instantiate another FrameIter with the
// copied data, its cx is still alive.
data->cx_ = activation()->cx();
return data;
}