From 3ff383eaecedb3e86006704822a408daa20e3ccc Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Mon, 26 Jun 2017 22:51:31 +0200
Subject: Remove isVerifyPreBarriersEnabled() stub and callers

---
 js/src/gc/GCRuntime.h | 2 --
 js/src/gc/Nursery.cpp | 1 -
 js/src/jsgc.cpp       | 2 +-
 js/src/vm/Runtime.cpp | 3 +--
 4 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'js')

diff --git a/js/src/gc/GCRuntime.h b/js/src/gc/GCRuntime.h
index d4bbe29db..5252903f3 100644
--- a/js/src/gc/GCRuntime.h
+++ b/js/src/gc/GCRuntime.h
@@ -838,8 +838,6 @@ class GCRuntime
                            AutoMaybeStartBackgroundAllocation& maybeStartBGAlloc);
     void recycleChunk(Chunk* chunk, const AutoLockGC& lock);
 
-    bool isVerifyPreBarriersEnabled() const { return false; }
-
     // Free certain LifoAlloc blocks when it is safe to do so.
     void freeUnusedLifoBlocksAfterSweeping(LifoAlloc* lifo);
     void freeAllLifoBlocksAfterSweeping(LifoAlloc* lifo);
diff --git a/js/src/gc/Nursery.cpp b/js/src/gc/Nursery.cpp
index d37c1673b..3a3860d6d 100644
--- a/js/src/gc/Nursery.cpp
+++ b/js/src/gc/Nursery.cpp
@@ -188,7 +188,6 @@ void
 js::Nursery::enable()
 {
     MOZ_ASSERT(isEmpty());
-    MOZ_ASSERT(!runtime()->gc.isVerifyPreBarriersEnabled());
     if (isEnabled())
         return;
 
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 4fa51417f..52a8c9f71 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -6744,7 +6744,7 @@ JS::IsIncrementalGCEnabled(JSContext* cx)
 JS_PUBLIC_API(bool)
 JS::IsIncrementalGCInProgress(JSContext* cx)
 {
-    return cx->gc.isIncrementalGCInProgress() && !cx->gc.isVerifyPreBarriersEnabled();
+    return cx->gc.isIncrementalGCInProgress();
 }
 
 JS_PUBLIC_API(bool)
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
-- 
cgit v1.2.3