summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--js/src/gc/GCRuntime.h2
-rw-r--r--js/src/gc/Nursery.cpp1
-rw-r--r--js/src/jsgc.cpp2
-rw-r--r--js/src/vm/Runtime.cpp3
4 files changed, 2 insertions, 6 deletions
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