summaryrefslogtreecommitdiffstats
path: root/js/src/vm/Caches-inl.h
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-02-03 15:50:22 -0500
committerMatt A. Tobin <email@mattatobin.com>2018-02-03 15:50:22 -0500
commit0083d404eff36f873cde465d50cd34b112bd124f (patch)
tree465b1f4322c3a2439903d9cabb068169bf6b42c9 /js/src/vm/Caches-inl.h
parentc6856f968b8c85502f14c6c3412b00a05fc0c0de (diff)
parent10494e1b7d0b3cd945bb76dca10f5637cf786f27 (diff)
downloadUXP-0083d404eff36f873cde465d50cd34b112bd124f.tar
UXP-0083d404eff36f873cde465d50cd34b112bd124f.tar.gz
UXP-0083d404eff36f873cde465d50cd34b112bd124f.tar.lz
UXP-0083d404eff36f873cde465d50cd34b112bd124f.tar.xz
UXP-0083d404eff36f873cde465d50cd34b112bd124f.zip
Merge branch 'master' into configurebuild-work
Diffstat (limited to 'js/src/vm/Caches-inl.h')
-rw-r--r--js/src/vm/Caches-inl.h3
1 files changed, 0 insertions, 3 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)