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] Sync copied entries instead of preserving in fixDoubleTypes, bug 639808.

Browse Source
This commit is contained in:
Brian Hackett 2011-03-08 20:03:20 -08:00
parent f59900ed51
commit a49752d076
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/jit-test/tests/jaeger/bug639808.js
View File

@ -5,3 +5,12 @@ function f() {
y - 1;
}
f();
function g(q) {
var x = 1.23;
var y = [].length;
x = ++y;
if (q)
assertEq(y + 5, 6);
}
g(1);

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

@ -1664,32 +1664,33 @@ FrameState::ensureDouble(FrameEntry *fe)
return;
}
if (fe->isCopy())
fe = fe->copyOf();
if (fe->isType(JSVAL_TYPE_DOUBLE))
return;
if (fe->isCopied()) {
/* Find and fixup the type for any copies of this entry. */
FrameEntry *backing = fe;
if (fe->isCopy()) {
/* Forget this entry is a copy. We are converting this entry, not the backing. */
backing = fe->copyOf();
fe->clear();
} else if (fe->isCopied()) {
/* Sync and forget any copies of this entry. */
for (uint32 i = fe->trackerIndex() + 1; i < tracker.nentries; i++) {
FrameEntry *nfe = tracker[i];
if (nfe->isCopy() && nfe->copyOf() == fe) {
nfe->setType(JSVAL_TYPE_DOUBLE, NULL);
nfe->data.unsync();
nfe->type.unsync();
syncFe(nfe);
nfe->resetSynced();
}
}
}
FPRegisterID fpreg = allocFPReg();
if (fe->isType(JSVAL_TYPE_INT32)) {
RegisterID data = tempRegForData(fe);
if (backing->isType(JSVAL_TYPE_INT32)) {
RegisterID data = tempRegForData(backing);
masm.convertInt32ToDouble(data, fpreg);
} else {
syncFe(fe);
masm.moveInt32OrDouble(addressOf(fe), fpreg);
syncFe(backing);
masm.moveInt32OrDouble(addressOf(backing), fpreg);
}
forgetAllRegs(fe);
@ -1700,8 +1701,6 @@ FrameState::ensureDouble(FrameEntry *fe)
fe->data.unsync();
fe->type.unsync();
return;
}
void