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

[INFER] Don't clobber address register in FrameState::storeTo, bug 649689. r=bhackett

Browse Source
This commit is contained in:
Jan de Mooij 2011-04-13 12:38:23 -07:00
parent 40a0021182
commit 5839315f83
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jit-test/tests/jaeger/bug649689.js Normal file
View File

@ -0,0 +1,6 @@
function f(x) {
eval("a = 3");
x.p = x.p = a;
assertEq(x.p, 3);
}
f({p: 2});

10
js/src/methodjit/FrameState.cpp
View File

@ -1091,7 +1091,6 @@ FrameState::storeTo(FrameEntry *fe, Address address, bool popped)
if (fe->isCopy())
fe = fe->copyOf();
/* Cannot clobber the address's register. */
JS_ASSERT(!a->freeRegs.hasReg(address.base));
/* If loading from memory, ensure destination differs. */
@ -1111,12 +1110,19 @@ FrameState::storeTo(FrameEntry *fe, Address address, bool popped)
return;
}
/* Don't clobber the address's register. */
bool pinAddressReg = !!regstate(address.base).fe();
if (pinAddressReg)
pinReg(address.base);
#if defined JS_PUNBOX64
if (fe->type.inMemory() && fe->data.inMemory()) {
/* Future optimization: track that the Value is in a register. */
RegisterID vreg = Registers::ValueReg;
masm.loadPtr(addressOf(fe), vreg);
masm.storePtr(vreg, address);
if (pinAddressReg)
unpinReg(address.base);
return;
}
@ -1219,6 +1225,8 @@ FrameState::storeTo(FrameEntry *fe, Address address, bool popped)
fe->type.setRegister(reg);
}
#endif
if (pinAddressReg)
unpinReg(address.base);
}
void