Bug 783537 - Fix some barrier accounting during JIT compilation (r=dvander)

This commit is contained in:
Bill McCloskey 2012-08-17 18:47:08 -07:00
parent ca6a8c8bbc
commit 3ffef35751
2 changed files with 3 additions and 3 deletions

View File

@ -665,7 +665,7 @@ class CallCompiler : public BaseCompiler
bool patchInlinePath(JSScript *script, JSObject *obj)
{
JS_ASSERT(ic.frameSize.isStatic());
JITScript *jit = script->getJIT(callingNew, f.cx->compartment->needsBarrier());
JITScript *jit = script->getJIT(callingNew, f.cx->compartment->compileBarriers());
/* Very fast path. */
Repatcher repatch(f.chunk());

View File

@ -546,7 +546,7 @@ class SetPropCompiler : public PICStubCompiler
* Since we're changing the object's shape, we need a write
* barrier. Taking the slow path is the easiest way to get one.
*/
if (cx->compartment->needsBarrier())
if (cx->compartment->compileBarriers())
return disable("ADDPROP write barrier required");
#endif
@ -2884,7 +2884,7 @@ SetElementIC::shouldUpdate(VMFrame &f)
return false;
}
#ifdef JSGC_INCREMENTAL_MJ
JS_ASSERT(!f.cx->compartment->needsBarrier());
JS_ASSERT(!f.cx->compartment->compileBarriers());
#endif
JS_ASSERT(stubsGenerated < MAX_PIC_STUBS);
return true;