diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2017-06-26 23:08:26 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-03 17:41:03 +0100 |
| commit | 6f342b2269e769a27dd0476cc4dc8a9c93c20235 (patch) | |
| tree | 10160b96267cf690aa97904939f73010db651cac /js/src/gc | |
| parent | 3ff383eaecedb3e86006704822a408daa20e3ccc (diff) | |
| download | uxp-6f342b2269e769a27dd0476cc4dc8a9c93c20235.tar.gz | |
Remove hasZealMode(mode) and callers
Diffstat (limited to 'js/src/gc')
| -rw-r--r-- | js/src/gc/GCRuntime.h | 2 | ||||
| -rw-r--r-- | js/src/gc/Nursery.cpp | 7 | ||||
| -rw-r--r-- | js/src/gc/Zone.h | 6 |
3 files changed, 3 insertions, 12 deletions
diff --git a/js/src/gc/GCRuntime.h b/js/src/gc/GCRuntime.h index 5252903f39..a426d759b2 100644 --- a/js/src/gc/GCRuntime.h +++ b/js/src/gc/GCRuntime.h @@ -600,7 +600,6 @@ class GCRuntime void finishRoots(); void finish(); - inline bool hasZealMode(ZealMode mode); inline void clearZealMode(ZealMode mode); inline bool upcomingZealousGC(); inline bool needZealousGC(); @@ -1355,7 +1354,6 @@ class MOZ_RAII AutoMaybeStartBackgroundAllocation } }; -inline bool GCRuntime::hasZealMode(ZealMode mode) { return false; } inline void GCRuntime::clearZealMode(ZealMode mode) { } inline bool GCRuntime::upcomingZealousGC() { return false; } inline bool GCRuntime::needZealousGC() { return false; } diff --git a/js/src/gc/Nursery.cpp b/js/src/gc/Nursery.cpp index 3a3860d6d3..72530b31b6 100644 --- a/js/src/gc/Nursery.cpp +++ b/js/src/gc/Nursery.cpp @@ -219,11 +219,8 @@ js::Nursery::isEmpty() const MOZ_ASSERT(runtime_); if (!isEnabled()) return true; - - if (!runtime_->hasZealMode(ZealMode::GenerationalGC)) { - MOZ_ASSERT(currentStartChunk_ == 0); - MOZ_ASSERT(currentStartPosition_ == chunk(0).start()); - } + MOZ_ASSERT(currentStartChunk_ == 0); + MOZ_ASSERT(currentStartPosition_ == chunk(0).start()); return position() == currentStartPosition_; } diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h index a3a6dc07f0..84d6f03ddd 100644 --- a/js/src/gc/Zone.h +++ b/js/src/gc/Zone.h @@ -253,11 +253,7 @@ struct Zone : public JS::shadow::Zone, // possibly at other times too. uint64_t gcNumber(); - bool compileBarriers() const { return compileBarriers(needsIncrementalBarrier()); } - bool compileBarriers(bool needsIncrementalBarrier) const { - return needsIncrementalBarrier || - runtimeFromMainThread()->hasZealMode(js::gc::ZealMode::VerifierPre); - } + bool compileBarriers() const { return needsIncrementalBarrier(); } enum ShouldUpdateJit { DontUpdateJit, UpdateJit }; void setNeedsIncrementalBarrier(bool needs, ShouldUpdateJit updateJit); |