5 files changed, 1 insertions, 20 deletions
diff --git a/js/src/vm/Caches-inl.h b/js/src/vm/Caches-inl.h
index 4eb8ecaa6..56e69a0d9 100644
--- a/js/src/vm/Caches-inl.h
+++ b/js/src/vm/Caches-inl.h
@@ -57,9 +57,6 @@ NewObjectCache::newObjectFromHit(JSContext* cx, EntryIndex entryIndex, gc::Initi
     if (group->shouldPreTenure())
         heap = gc::TenuredHeap;
 
-    if (cx->runtime()->gc.upcomingZealousGC())
-        return nullptr;
-
     NativeObject* obj = static_cast<NativeObject*>(Allocate<JSObject, NoGC>(cx, entry->kind, 0,
                                                                             heap, group->clasp()));
     if (!obj)
diff --git a/js/src/vm/EnvironmentObject.h b/js/src/vm/EnvironmentObject.h
index 6bdaac89e..d457ca839 100644
--- a/js/src/vm/EnvironmentObject.h
+++ b/js/src/vm/EnvironmentObject.h
@@ -930,9 +930,6 @@ class DebugEnvironments
     void mark(JSTracer* trc);
     void sweep(JSRuntime* rt);
     void finish();
-#ifdef JS_GC_ZEAL
-    void checkHashTablesAfterMovingGC(JSRuntime* rt);
-#endif
 
     // If a live frame has a synthesized entry in missingEnvs, make sure it's not
     // collected.
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);
 
diff --git a/js/src/vm/Runtime.cpp b/js/src/vm/Runtime.cpp
index 646d48299..0d6a3922c 100644
--- a/js/src/vm/Runtime.cpp
+++ b/js/src/vm/Runtime.cpp
@@ -868,8 +868,7 @@ bool
 JSRuntime::activeGCInAtomsZone()
 {
     Zone* zone = atomsCompartment_->zone();
-    return (zone->needsIncrementalBarrier() && !gc.isVerifyPreBarriersEnabled()) ||
-           zone->wasGCStarted();
+    return zone->needsIncrementalBarrier() || zone->wasGCStarted();
 }
 
 void
diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h
index 4f7755b9d..734543c4e 100644
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -866,8 +866,6 @@ struct JSRuntime : public JS::shadow::Runtime,
     /* Garbage collector state has been successfully initialized. */
     bool                gcInitialized;
 
-    bool hasZealMode(js::gc::ZealMode mode) { return gc.hasZealMode(mode); }
-
     void lockGC() {
         gc.lockGC();
     }