From 95badd197469e377bbed2319b8c5ee1e9581fa12 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Mon, 26 Jun 2017 23:13:01 +0200
Subject: Remove upcomingZealousGC() and caller

---
 js/src/gc/GCRuntime.h  | 2 --
 js/src/vm/Caches-inl.h | 3 ---
 2 files changed, 5 deletions(-)

(limited to 'js')

diff --git a/js/src/gc/GCRuntime.h b/js/src/gc/GCRuntime.h
index 2cad0b3b3..cc558c2db 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 upcomingZealousGC();
     inline bool needZealousGC();
 
     MOZ_MUST_USE bool addRoot(Value* vp, const char* name);
@@ -1353,7 +1352,6 @@ class MOZ_RAII AutoMaybeStartBackgroundAllocation
     }
 };
 
-inline bool GCRuntime::upcomingZealousGC() { return false; }
 inline bool GCRuntime::needZealousGC() { return false; }
 
 } /* namespace gc */
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)
-- 
cgit v1.2.3