diff options
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/jit-test/tests/ion/bug730152.js | 4 | ||||
| -rw-r--r-- | js/src/jit-test/tests/ion/bug732758.js | 1 | ||||
| -rw-r--r-- | js/src/jit/VMFunctions.cpp | 4 | ||||
| -rw-r--r-- | js/src/jsgc.h | 10 | ||||
| -rw-r--r-- | js/src/vm/Interpreter.cpp | 10 |
5 files changed, 0 insertions, 29 deletions
diff --git a/js/src/jit-test/tests/ion/bug730152.js b/js/src/jit-test/tests/ion/bug730152.js deleted file mode 100644 index fe4ecfe14..000000000 --- a/js/src/jit-test/tests/ion/bug730152.js +++ /dev/null @@ -1,4 +0,0 @@ -if (typeof verifybarriers !== "undefined") { - for (var i = 0; i < 30; i++) {} - for (i in Function("gc(verifybarriers()); yield")()) {} -} diff --git a/js/src/jit-test/tests/ion/bug732758.js b/js/src/jit-test/tests/ion/bug732758.js index 91da521c7..8196c3e03 100644 --- a/js/src/jit-test/tests/ion/bug732758.js +++ b/js/src/jit-test/tests/ion/bug732758.js @@ -38,5 +38,4 @@ tryItOut("{t:g}"); tryItOut("r"); tryItOut("p"); tryItOut("gc()"); -tryItOut("verifybarriers()"); tryItOut("/**/yield"); diff --git a/js/src/jit/VMFunctions.cpp b/js/src/jit/VMFunctions.cpp index a299d27a5..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); diff --git a/js/src/jsgc.h b/js/src/jsgc.h index c0d86781d..7ad176d84 100644 --- a/js/src/jsgc.h +++ b/js/src/jsgc.h @@ -1264,16 +1264,6 @@ enum VerifierType { PreBarrierVerifier }; -static inline void -VerifyBarriers(JSRuntime* rt, VerifierType type) -{ -} - -static inline void -MaybeVerifyBarriers(JSContext* cx, bool always = false) -{ -} - /* * Instances of this class set the |JSRuntime::suppressGC| flag for the duration * that they are live. Use of this class is highly discouraged. Please carefully diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp index 3ca379d01..fbf526ae5 100644 --- a/js/src/vm/Interpreter.cpp +++ b/js/src/vm/Interpreter.cpp @@ -1647,7 +1647,6 @@ Interpret(JSContext* cx, RunState& state) #define ADVANCE_AND_DISPATCH(N) \ JS_BEGIN_MACRO \ REGS.pc += (N); \ - SANITY_CHECKS(); \ DISPATCH_TO(*REGS.pc | activation.opMask()); \ JS_END_MACRO @@ -1727,12 +1726,6 @@ Interpret(JSContext* cx, RunState& state) activation.enableInterruptsUnconditionally(); \ JS_END_MACRO -#define SANITY_CHECKS() \ - JS_BEGIN_MACRO \ - js::gc::MaybeVerifyBarriers(cx); \ - JS_END_MACRO - - gc::MaybeVerifyBarriers(cx, true); MOZ_ASSERT(!cx->zone()->types.activeAnalysis); InterpreterFrame* entryFrame = state.pushInterpreterFrame(cx); @@ -1863,7 +1856,6 @@ CASE(EnableInterruptsPseudoOpcode) activation.clearInterruptsMask(); /* Commence executing the actual opcode. */ - SANITY_CHECKS(); DISPATCH_TO(op); } @@ -4184,8 +4176,6 @@ DEFAULT() REGS.fp()->epilogue(cx, REGS.pc); } - gc::MaybeVerifyBarriers(cx, true); - TraceLogStopEvent(logger, TraceLogger_Engine); TraceLogStopEvent(logger, scriptEvent); |