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 1133389 - Fix FrameIter::matchCallee to consider all inner functions and not only lambdas. r=shu

Browse Source
This commit is contained in:
Nicolas B. Pierron 2015-03-13 16:14:03 +01:00
parent ea5d562afd
commit 5b02a8b7e0
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/src/jit-test/tests/ion/recover-lambdas-bug1133389.js Normal file
View File

@ -0,0 +1,17 @@
var o = {}
Object.defineProperty(o, "p", {
get: function() {
return arguments.callee.caller.caller;
}
});
function f() {
function g() {
return o.p;
}
return g();
}
for (var k = 0; k < 2; k++) {
assertEq(f(), f);
}

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

@ -1108,12 +1108,6 @@ FrameIter::matchCallee(JSContext *cx, HandleFunction fun) const
return false;
}
// Only some lambdas are optimized in a way which cannot be recovered without
// invalidating the frame. Thus, if one of the function is not a lambda we can just
// compare it against the calleeTemplate.
if (!fun->isLambda() || !currentCallee->isLambda())
return currentCallee == fun;
// Use the same condition as |js::CloneFunctionObject|, to know if we should
// expect both functions to have the same JSScript. If so, and if they are
// different, then they cannot be equal.