diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-03 19:02:06 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-03 19:03:05 +0100 |
commit | 10494e1b7d0b3cd945bb76dca10f5637cf786f27 (patch) | |
tree | 8a6487e386c06e7dfe63f2a4f2ffe5b589c59f60 /js/src/vm/Runtime.cpp | |
parent | 559933a9a58f96ac62ad0f60602f45344581604f (diff) | |
parent | e27da6cc5e825b58f810b368b2bd59bca2164ab0 (diff) | |
download | UXP-10494e1b7d0b3cd945bb76dca10f5637cf786f27.tar UXP-10494e1b7d0b3cd945bb76dca10f5637cf786f27.tar.gz UXP-10494e1b7d0b3cd945bb76dca10f5637cf786f27.tar.lz UXP-10494e1b7d0b3cd945bb76dca10f5637cf786f27.tar.xz UXP-10494e1b7d0b3cd945bb76dca10f5637cf786f27.zip |
Merge branch 'ported-moebius'
Remove GCZeal code from Spidermonkey.
This resolves #8
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 |