Commit 83981e20 authored by Bill McCloskey's avatar Bill McCloskey
Browse files

Bug 774859 - JM: Missing write barrier on JSOP_INITPROP (r=bhackett)

parent 975db7ce
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
gczeal(4,1);
function g()
{
    try {
	return [];
    } catch (e) {}
}
function f()
{
    for (var i=0; i<2; i++) {
	var o = {a: g(),
		 a: g()};
	print(i);
    }
}
f();
+1 −1
Original line number Diff line number Diff line
@@ -2685,7 +2685,7 @@ mjit::Compiler::jsop_initprop()

    RootedObject baseobj(cx, frame.extra(obj).initObject);

    if (!baseobj || monitored(PC)) {
    if (!baseobj || monitored(PC) || cx->compartment->compileBarriers()) {
        prepareStubCall(Uses(2));
        masm.move(ImmPtr(name), Registers::ArgReg1);
        INLINE_STUBCALL(stubs::InitProp, REJOIN_FALLTHROUGH);