diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-03 15:50:22 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-03 15:50:22 -0500 |
| commit | 0083d404eff36f873cde465d50cd34b112bd124f (patch) | |
| tree | 465b1f4322c3a2439903d9cabb068169bf6b42c9 /js/src/jit | |
| parent | c6856f968b8c85502f14c6c3412b00a05fc0c0de (diff) | |
| parent | 10494e1b7d0b3cd945bb76dca10f5637cf786f27 (diff) | |
| download | UXP-0083d404eff36f873cde465d50cd34b112bd124f.tar UXP-0083d404eff36f873cde465d50cd34b112bd124f.tar.gz UXP-0083d404eff36f873cde465d50cd34b112bd124f.tar.lz UXP-0083d404eff36f873cde465d50cd34b112bd124f.tar.xz UXP-0083d404eff36f873cde465d50cd34b112bd124f.zip | |
Merge branch 'master' into configurebuild-work
Diffstat (limited to 'js/src/jit')
| -rw-r--r-- | js/src/jit/CompileWrappers.h | 4 | ||||
| -rw-r--r-- | js/src/jit/VMFunctions.cpp | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/js/src/jit/CompileWrappers.h b/js/src/jit/CompileWrappers.h index bbec9ffa3..ccded4f13 100644 --- a/js/src/jit/CompileWrappers.h +++ b/js/src/jit/CompileWrappers.h @@ -51,10 +51,6 @@ class CompileRuntime // &runtime()->activation_ const void* addressOfActivation(); -#ifdef JS_GC_ZEAL - const void* addressOfGCZealModeBits(); -#endif - const void* addressOfInterruptUint32(); // We have to bake JSContext* into JIT code, but this pointer shouldn't be diff --git a/js/src/jit/VMFunctions.cpp b/js/src/jit/VMFunctions.cpp index 628b31fae..4edbc3c83 100644 --- a/js/src/jit/VMFunctions.cpp +++ b/js/src/jit/VMFunctions.cpp @@ -135,7 +135,6 @@ CheckOverRecursed(JSContext* cx) #else JS_CHECK_RECURSION(cx, return false); #endif - gc::MaybeVerifyBarriers(cx); return cx->runtime()->handleInterrupt(cx); } @@ -180,7 +179,6 @@ CheckOverRecursedWithExtra(JSContext* cx, BaselineFrame* frame, JS_CHECK_RECURSION_WITH_SP(cx, checkSp, return false); #endif - gc::MaybeVerifyBarriers(cx); return cx->runtime()->handleInterrupt(cx); } @@ -465,8 +463,6 @@ SetProperty(JSContext* cx, HandleObject obj, HandlePropertyName name, HandleValu bool InterruptCheck(JSContext* cx) { - gc::MaybeVerifyBarriers(cx); - { JSRuntime* rt = cx->runtime(); JitRuntime::AutoPreventBackedgePatching apbp(rt); @@ -627,11 +623,7 @@ PostWriteElementBarrier(JSRuntime* rt, JSObject* obj, int32_t index) if (obj->is<NativeObject>() && !obj->as<NativeObject>().isInWholeCellBuffer() && uint32_t(index) < obj->as<NativeObject>().getDenseInitializedLength() && - (obj->as<NativeObject>().getDenseInitializedLength() > MAX_WHOLE_CELL_BUFFER_SIZE -#ifdef JS_GC_ZEAL - || rt->hasZealMode(gc::ZealMode::ElementsBarrier) -#endif - )) + (obj->as<NativeObject>().getDenseInitializedLength() > MAX_WHOLE_CELL_BUFFER_SIZE)) { rt->gc.storeBuffer.putSlot(&obj->as<NativeObject>(), HeapSlot::Element, index, 1); return; |