summaryrefslogtreecommitdiffstats
path: root/js/src
diff options
context:
space:
mode:
Diffstat (limited to 'js/src')
-rw-r--r--js/src/jsgc.cpp12
-rw-r--r--js/src/jsgc.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index a1296f0d8..f528b2d70 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3578,7 +3578,7 @@ ShouldCollectZone(Zone* zone, JS::gcreason::Reason reason)
return zone->isGCScheduled();
// If we are repeating a GC becuase we noticed dead compartments haven't
- // been collected, then only collect zones contianing those compartments.
+ // been collected, then only collect zones containing those compartments.
for (CompartmentsInZoneIter comp(zone); !comp.done(); comp.next()) {
if (comp->scheduledForDestruction)
return true;
@@ -3753,8 +3753,8 @@ GCRuntime::beginMarkPhase(JS::gcreason::Reason reason, AutoLockForExclusiveAcces
gcstats::AutoPhase ap2(stats, gcstats::PHASE_MARK_ROOTS);
- if (isIncremental) {
- bufferGrayRoots();
+ if (isIncremental) {
+ bufferGrayRoots();
markCompartments();
}
@@ -5508,8 +5508,8 @@ gc::IsIncrementalGCUnsafe(JSRuntime* rt)
{
MOZ_ASSERT(!rt->mainThread.suppressGC);
- if (rt->keepAtoms())
- return gc::AbortReason::KeepAtomsSet;
+ if (rt->keepAtoms())
+ return gc::AbortReason::KeepAtomsSet;
if (!rt->gc.isIncrementalGCAllowed())
return gc::AbortReason::IncrementalDisabled;
@@ -5519,7 +5519,7 @@ gc::IsIncrementalGCUnsafe(JSRuntime* rt)
void
GCRuntime::budgetIncrementalGC(JS::gcreason::Reason reason, SliceBudget& budget,
- AutoLockForExclusiveAccess& lock)
+ AutoLockForExclusiveAccess& lock)
{
AbortReason unsafeReason = IsIncrementalGCUnsafe(rt);
if (unsafeReason == AbortReason::None) {
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index 85b9f5f4a..d00d2aef6 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -354,7 +354,7 @@ struct SortedArenaListSegment
* be treated as an invariant, however, as the free lists may be cleared,
* leaving arenas previously used for allocation partially full. Sorting order
* is restored during sweeping.
-
+
* Arenas following the cursor should not be full.
*/
class ArenaList {