Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-02 07:05:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[JAEGER] Fixed PROPINC etc using the property cache (bug 589115, r=dmandelin).

Browse Source 
--HG--
extra : rebase_source : 6a58de4b3044c6ce4afa160e1fb497df4a6d290b
This commit is contained in:
David Anderson 2010-08-24 00:57:57 -04:00
parent b5c0841ea3
commit 4101030c9e
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2612,8 +2612,21 @@ mjit::Compiler::jsop_setprop(JSAtom *atom)
pic.typeCheck = stubcc.masm.label();
stubcc.linkExit(j, Uses(2));
stubcc.leave();
stubcc.masm.move(ImmPtr(atom), Registers::ArgReg1);
stubcc.call(stubs::SetName);
/*
* This gets called from PROPINC/PROPDEC which aren't compatible with
* the normal SETNAME property cache logic.
*/
JSOp op = JSOp(*PC);
if (op == JSOP_SETNAME || op == JSOP_SETPROP || op == JSOP_SETGNAME || op ==
JSOP_SETMETHOD) {
stubcc.masm.move(ImmPtr(atom), Registers::ArgReg1);
stubcc.call(stubs::SetName);
} else {
stubcc.masm.move(Imm32(pics.length()), Registers::ArgReg1);
stubcc.call(ic::SetPropDumb);
}
typeCheck = stubcc.masm.jump();
pic.hasTypeCheck = true;
} else {

4
js/src/methodjit/PolyIC.cpp
View File

@ -1901,8 +1901,8 @@ ic::GetElem(VMFrame &f, uint32 picIndex)
f.regs.sp[-2] = v;
}
static void JS_FASTCALL
SetPropDumb(VMFrame &f, uint32 index)
void JS_FASTCALL
ic::SetPropDumb(VMFrame &f, uint32 index)
{
JSScript *script = f.fp()->getScript();
ic::PICInfo &pic = script->pics[index];

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

@ -353,6 +353,7 @@ void JS_FASTCALL SetProp(VMFrame &f, uint32 index);
void JS_FASTCALL CallProp(VMFrame &f, uint32 index);
void JS_FASTCALL Name(VMFrame &f, uint32 index);
void JS_FASTCALL BindName(VMFrame &f, uint32 index);
void JS_FASTCALL SetPropDumb(VMFrame &f, uint32 index);
} /* namespace ic */
} /* namespace mjit */

6
js/src/trace-test/tests/jaeger/bug589115.js Normal file
View File

@ -0,0 +1,6 @@
for each(y in ['', 0, '']) {
y.lastIndexOf--
}
/* Don't assert/crash. */