diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-03 15:50:22 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-03 15:50:22 -0500 |
| commit | 0083d404eff36f873cde465d50cd34b112bd124f (patch) | |
| tree | 465b1f4322c3a2439903d9cabb068169bf6b42c9 /js/src/gc/Allocator.cpp | |
| parent | c6856f968b8c85502f14c6c3412b00a05fc0c0de (diff) | |
| parent | 10494e1b7d0b3cd945bb76dca10f5637cf786f27 (diff) | |
| download | UXP-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/gc/Allocator.cpp')
| -rw-r--r-- | js/src/gc/Allocator.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/js/src/gc/Allocator.cpp b/js/src/gc/Allocator.cpp index f7dc50d02..3994d5a5b 100644 --- a/js/src/gc/Allocator.cpp +++ b/js/src/gc/Allocator.cpp @@ -190,7 +190,7 @@ GCRuntime::checkAllocatorState(JSContext* cx, AllocKind kind) return false; } -#if defined(JS_GC_ZEAL) || defined(DEBUG) +#if defined(DEBUG) MOZ_ASSERT_IF(cx->compartment()->isAtomsCompartment(), kind == AllocKind::ATOM || kind == AllocKind::FAT_INLINE_ATOM || @@ -223,11 +223,6 @@ GCRuntime::checkAllocatorState(JSContext* cx, AllocKind kind) bool GCRuntime::gcIfNeededPerAllocation(JSContext* cx) { -#ifdef JS_GC_ZEAL - if (needZealousGC()) - runDebugGC(); -#endif - // Invoking the interrupt callback can fail and we can't usefully // handle that here. Just check in case we need to collect instead. if (rt->hasPendingInterrupt()) |