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/vm/Runtime.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/vm/Runtime.cpp')
| -rw-r--r-- | js/src/vm/Runtime.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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 |