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] Assume double types for entries with empty type sets being merged into double phi nodes, bug 653249.

Browse Source
This commit is contained in:
Brian Hackett 2011-05-01 17:38:05 -07:00
parent d868b00326
commit 052373f8bb
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/jit-test/tests/jaeger/bug653249.js Normal file
View File

@ -0,0 +1,13 @@
function testUnaryImacros() {
function checkArg(x) {
o = {
valueOf: checkArg
}
}
var v = 0;
v += +toString;
for (var i = 0; i;) {
v += [].checkArg.checkArg;
}
}(testUnaryImacros(), "valueOf passed, toString passed");

20
js/src/methodjit/Compiler.cpp
View File

@ -7129,14 +7129,24 @@ mjit::Compiler::fixDoubleTypes(jsbytecode *target)
continue; continue;
} }
if (newv->slot < analyze::TotalSlots(script)) { if (newv->slot < analyze::TotalSlots(script)) {
types::TypeSet *targetTypes = analysis->getValueTypes(newv->value);
VarType &vt = a->varTypes[newv->slot]; VarType &vt = a->varTypes[newv->slot];
if (vt.type == JSVAL_TYPE_INT32) { if (targetTypes->getKnownTypeTag(cx) == JSVAL_TYPE_DOUBLE &&
types::TypeSet *targetTypes = analysis->getValueTypes(newv->value); fixDoubleSlot(newv->slot)) {
if (targetTypes->getKnownTypeTag(cx) == JSVAL_TYPE_DOUBLE && FrameEntry *fe = frame.getOrTrack(newv->slot);
fixDoubleSlot(newv->slot)) { if (vt.type == JSVAL_TYPE_INT32) {
fixedDoubleEntries.append(newv->slot); fixedDoubleEntries.append(newv->slot);
FrameEntry *fe = frame.getOrTrack(newv->slot);
frame.ensureDouble(fe); frame.ensureDouble(fe);
} else if (vt.type == JSVAL_TYPE_UNKNOWN) {
/*
* Unknown here but a double at the target. The type
* set for the existing value must be empty, so this
* code is doomed and we can just mark the value as
* a double.
*/
frame.ensureDouble(fe);
} else {
JS_ASSERT(vt.type == JSVAL_TYPE_DOUBLE);
} }
} }
} }

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

@ -1354,10 +1354,12 @@ FrameState::assertValidRegisterState() const
if (fe->type.inRegister()) { if (fe->type.inRegister()) {
checkedFreeRegs.takeReg(fe->type.reg()); checkedFreeRegs.takeReg(fe->type.reg());
JS_ASSERT(regstate(fe->type.reg()).fe() == fe); JS_ASSERT(regstate(fe->type.reg()).fe() == fe);
JS_ASSERT(!fe->isType(JSVAL_TYPE_DOUBLE));
} }
if (fe->data.inRegister()) { if (fe->data.inRegister()) {
checkedFreeRegs.takeReg(fe->data.reg()); checkedFreeRegs.takeReg(fe->data.reg());
JS_ASSERT(regstate(fe->data.reg()).fe() == fe); JS_ASSERT(regstate(fe->data.reg()).fe() == fe);
JS_ASSERT(!fe->isType(JSVAL_TYPE_DOUBLE));
} }
if (fe->data.inFPRegister()) { if (fe->data.inFPRegister()) {
JS_ASSERT(fe->isType(JSVAL_TYPE_DOUBLE)); JS_ASSERT(fe->isType(JSVAL_TYPE_DOUBLE));