Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 18:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[INFER] Don't use loop registers for entries after coercing them to double/any for a branch, bug 682563.

Browse Source
This commit is contained in:
Brian Hackett 2011-08-29 13:59:06 -07:00
parent 8c70798deb
commit 3f53e9d341
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6918,6 +6918,7 @@ mjit::Compiler::fixDoubleTypes(jsbytecode *target)
if (vt.type == JSVAL_TYPE_INT32) {
fixedIntToDoubleEntries.append(newv->slot);
frame.ensureDouble(fe);
frame.forgetLoopReg(fe);
} else if (vt.type == JSVAL_TYPE_UNKNOWN) {
/*
* Unknown here but a double at the target. The type
@ -6932,6 +6933,7 @@ mjit::Compiler::fixDoubleTypes(jsbytecode *target)
} else if (fe->isType(JSVAL_TYPE_DOUBLE)) {
fixedDoubleToAnyEntries.append(newv->slot);
frame.syncAndForgetFe(fe);
frame.forgetLoopReg(fe);
}
newv++;
}

11
js/src/methodjit/FrameState-inl.h
View File

@ -878,6 +878,17 @@ FrameState::syncAndForgetFe(FrameEntry *fe, bool markSynced)
fe->data.setMemory();
}
inline void
FrameState::forgetLoopReg(FrameEntry *fe)
{
/*
* Don't use a loop register for fe in the active loop, as its underlying
* representation may have changed since the start of the loop.
*/
if (loop)
fe->lastLoop = loop->headOffset();
}
inline void
FrameState::syncType(FrameEntry *fe)
{

1
js/src/methodjit/FrameState.h
View File

@ -951,6 +951,7 @@ class FrameState
Vector<TemporaryCopy> *getTemporaryCopies();
inline void syncAndForgetFe(FrameEntry *fe, bool markSynced = false);
inline void forgetLoopReg(FrameEntry *fe);
private:
inline AnyRegisterID allocAndLoadReg(FrameEntry *fe, bool fp, RematInfo::RematType type);