Fix bogus assert, bug 687399. r=dvander
authorBrian Hackett <bhackett1024@gmail.com>
Fri, 23 Sep 2011 07:12:36 -0700
changeset 77420 65d1dc5881f042286ea5225b494829448184c0cf
parent 77419 0641651a7a5761b5e095da542654c655bb713897
child 77421 35e3a5f3c07baa08ed2b9d047817bbfa31d3db18
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewersdvander
bugs687399
milestone9.0a1
Fix bogus assert, bug 687399. r=dvander
js/src/methodjit/FrameState.cpp
--- a/js/src/methodjit/FrameState.cpp
+++ b/js/src/methodjit/FrameState.cpp
@@ -796,17 +796,18 @@ FrameState::syncForAllocation(RegisterAl
             relocateReg(reg, alloc, uses);
 
         if (reg.isReg()) {
             RegisterID nreg = reg.reg();
             if (fe->isType(JSVAL_TYPE_DOUBLE)) {
                 JS_ASSERT(!a->analysis->trackSlot(entrySlot(fe)));
                 syncFe(fe);
                 forgetAllRegs(fe);
-                fe->resetSynced();
+                fe->type.setMemory();
+                fe->data.setMemory();
             }
             if (fe->data.inMemory()) {
                 masm.loadPayload(addressOf(fe), nreg);
             } else if (fe->isConstant()) {
                 masm.loadValuePayload(fe->getValue(), nreg);
             } else {
                 JS_ASSERT(fe->data.inRegister() && fe->data.reg() != nreg);
                 masm.move(fe->data.reg(), nreg);