Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1654890 - Confusingly-named AutoDisableBarriers also enables barriers r=jonco

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D84749
This commit is contained in:
Steve Fink 2020-07-24 08:08:18 +00:00
parent ec79b797d6
commit e1628c88f9
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/src/gc/GC.cpp
View File

@ -6502,12 +6502,13 @@ GCRuntime::IncrementalResult GCRuntime::resetIncrementalGC(
namespace {
/*
* Temporarily disable barriers during GC slices.
* Manage barriers: disable during GC slices, and enable during an incremental
* GC for all zones that are marking.
*/
class AutoDisableBarriers {
class AutoUpdateBarriers {
public:
explicit AutoDisableBarriers(GCRuntime* gc);
~AutoDisableBarriers();
explicit AutoUpdateBarriers(GCRuntime* gc);
~AutoUpdateBarriers();
private:
GCRuntime* gc;
@ -6515,13 +6516,13 @@ class AutoDisableBarriers {
} /* anonymous namespace */
AutoDisableBarriers::AutoDisableBarriers(GCRuntime* gc) : gc(gc) {
AutoUpdateBarriers::AutoUpdateBarriers(GCRuntime* gc) : gc(gc) {
for (GCZonesIter zone(gc); !zone.done(); zone.next()) {
/*
* Clear needsIncrementalBarrier early so we don't do any write
* barriers during GC. We don't need to update the Ion barriers (which
* is expensive) because Ion code doesn't run during GC. If need be,
* we'll update the Ion barriers in ~AutoDisableBarriers.
* we'll update the Ion barriers in ~AutoUpdateBarriers.
*/
if (zone->isGCMarking()) {
MOZ_ASSERT(zone->needsIncrementalBarrier());
@ -6531,7 +6532,7 @@ AutoDisableBarriers::AutoDisableBarriers(GCRuntime* gc) : gc(gc) {
}
}
AutoDisableBarriers::~AutoDisableBarriers() {
AutoUpdateBarriers::~AutoUpdateBarriers() {
/* We can't use GCZonesIter if this is the end of the last slice. */
for (ZonesIter zone(gc, WithAtoms); !zone.done(); zone.next()) {
MOZ_ASSERT(!zone->needsIncrementalBarrier());
@ -6556,7 +6557,7 @@ static bool ShouldSweepOnBackgroundThread(JS::GCReason reason) {
void GCRuntime::incrementalSlice(SliceBudget& budget,
const MaybeInvocationKind& gckind,
JS::GCReason reason, AutoGCSession& session) {
AutoDisableBarriers disableBarriers(this);
AutoUpdateBarriers updateBarriers(this);
AutoSetThreadIsPerformingGC performingGC;
bool destroyingRuntime = (reason == JS::GCReason::DESTROY_RUNTIME);