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 1132770 - Don't omit overrecursion check in scripts with potential scripted getter/setter ICs. r=sunfish

Browse Source
This commit is contained in:
Jan de Mooij 2015-02-19 13:19:05 +01:00
parent 13fb9a89bc
commit e9c1a83509
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jit-test/tests/ion/bug1132770.js Normal file
View File

@ -0,0 +1,4 @@
// |jit-test| error: too much recursion
Object.defineProperty(this, "x", {set: function() { this.x = 2; }});
setJitCompilerOption("ion.warmup.trigger", 30);
x ^= 1;

18
js/src/jit/Lowering.cpp
View File

@ -3066,6 +3066,11 @@ LIRGenerator::visitGetNameCache(MGetNameCache *ins)
{
MOZ_ASSERT(ins->scopeObj()->type() == MIRType_Object);
// Set the performs-call flag so that we don't omit the overrecursed check.
// This is necessary because the cache can attach a scripted getter stub
// that calls this script recursively.
gen->setPerformsCall();
LGetNameCache *lir = new(alloc()) LGetNameCache(useRegister(ins->scopeObj()));
defineBox(lir, ins);
assignSafepoint(lir, ins);
@ -3083,6 +3088,14 @@ void
LIRGenerator::visitGetPropertyCache(MGetPropertyCache *ins)
{
MOZ_ASSERT(ins->object()->type() == MIRType_Object);
if (ins->monitoredResult()) {
// Set the performs-call flag so that we don't omit the overrecursed
// check. This is necessary because the cache can attach a scripted
// getter stub that calls this script recursively.
gen->setPerformsCall();
}
if (ins->type() == MIRType_Value) {
LGetPropertyCacheV *lir = new(alloc()) LGetPropertyCacheV(useRegister(ins->object()));
defineBox(lir, ins);
@ -3313,6 +3326,11 @@ LIRGenerator::visitSetPropertyCache(MSetPropertyCache *ins)
LUse obj = useRegisterAtStart(ins->object());
LDefinition slots = tempCopy(ins->object(), 0);
// Set the performs-call flag so that we don't omit the overrecursed check.
// This is necessary because the cache can attach a scripted setter stub
// that calls this script recursively.
gen->setPerformsCall();
LInstruction *lir;
if (ins->value()->type() == MIRType_Value) {
lir = new(alloc()) LSetPropertyCacheV(obj, slots);