|
@@ -2,7 +2,7 @@
|
|
|
# User Ehsan Akhgari <ehsan@mozilla.com>
|
|
|
# Date 1547802776 -3600
|
|
|
# Node ID 9916e7d6e32720362fd18ed03f1acff4884b86df
|
|
|
-# Parent 41bd1aa12c07f30f19a288ffef64a57f3f417a72
|
|
|
+# Parent 10ee514c833eab97c5993d6d54c545751dc81c63
|
|
|
Bug 1521000 - Part 1: Reformat the tree to ensure everything is formatted correctly with clang-format r=sylvestre
|
|
|
|
|
|
Summary: # ignore-this-changeset
|
|
@@ -154,7 +154,7 @@ diff --git a/js/src/frontend/NameFunctions.cpp b/js/src/frontend/NameFunctions.c
|
|
|
diff --git a/js/src/gc/GC.cpp b/js/src/gc/GC.cpp
|
|
|
--- a/js/src/gc/GC.cpp
|
|
|
+++ b/js/src/gc/GC.cpp
|
|
|
-@@ -590,17 +590,17 @@ inline size_t Arena::finalize(FreeOp* fo
|
|
|
+@@ -587,17 +587,17 @@ inline size_t Arena::finalize(FreeOp* fo
|
|
|
thing - thingSize, this);
|
|
|
newListTail = newListTail->nextSpanUnchecked(this);
|
|
|
}
|
|
@@ -173,7 +173,7 @@ diff --git a/js/src/gc/GC.cpp b/js/src/gc/GC.cpp
|
|
|
// Do nothing. The caller will update the arena appropriately.
|
|
|
MOZ_ASSERT(newListTail == &newListHead);
|
|
|
DebugOnlyPoison(data, JS_SWEPT_TENURED_PATTERN, sizeof(data),
|
|
|
-@@ -3573,18 +3573,18 @@ void GCRuntime::sweepFromBackgroundThrea
|
|
|
+@@ -3558,18 +3558,18 @@ void GCRuntime::sweepFromBackgroundThrea
|
|
|
ZoneList zones;
|
|
|
zones.transferFrom(backgroundSweepZones.ref());
|
|
|
LifoAlloc freeLifoAlloc(JSContext::TEMP_LIFO_ALLOC_PRIMARY_CHUNK_SIZE);
|
|
@@ -194,7 +194,7 @@ diff --git a/js/src/gc/GC.cpp b/js/src/gc/GC.cpp
|
|
|
sweepTask.join();
|
|
|
|
|
|
// TODO: Improve assertion to work in incremental GC?
|
|
|
-@@ -3628,18 +3628,17 @@ void GCRuntime::startBackgroundFree() {
|
|
|
+@@ -3613,18 +3613,17 @@ void GCRuntime::startBackgroundFree() {
|
|
|
AutoLockHelperThreadState lock;
|
|
|
freeTask.startOrRunIfIdle(lock);
|
|
|
} else {
|
|
@@ -214,7 +214,7 @@ diff --git a/js/src/gc/GC.cpp b/js/src/gc/GC.cpp
|
|
|
// Signal to the main thread that we're about to finish, because we release
|
|
|
// the lock again before GCParallelTask's state is changed to finished.
|
|
|
setFinishing(lock);
|
|
|
-@@ -3652,26 +3651,25 @@ void GCRuntime::freeFromBackgroundThread
|
|
|
+@@ -3637,26 +3636,25 @@ void GCRuntime::freeFromBackgroundThread
|
|
|
|
|
|
Nursery::BufferSet buffers;
|
|
|
mozilla::Swap(buffers, buffersToFreeAfterMinorGC.ref());
|
|
@@ -244,7 +244,7 @@ diff --git a/js/src/gc/GC.cpp b/js/src/gc/GC.cpp
|
|
|
bool result = IsAboutToBeFinalizedUnbarriered(reinterpret_cast<T**>(t));
|
|
|
// Sweep should not have to deal with moved pointers, since moving GC
|
|
|
// handles updating the UID table manually.
|
|
|
-@@ -4211,18 +4209,17 @@ bool GCRuntime::prepareZonesForCollectio
|
|
|
+@@ -4196,18 +4194,17 @@ bool GCRuntime::prepareZonesForCollectio
|
|
|
return any;
|
|
|
}
|
|
|
|
|
@@ -264,7 +264,7 @@ diff --git a/js/src/gc/GC.cpp b/js/src/gc/GC.cpp
|
|
|
gcstats::AutoPhase ap(rt->gc.stats(), gcstats::PhaseKind::RELAZIFY_FUNCTIONS);
|
|
|
for (GCZonesIter zone(rt); !zone.done(); zone.next()) {
|
|
|
if (zone->isSelfHostingZone()) {
|
|
|
-@@ -6929,18 +6926,18 @@ static bool ShouldCleanUpEverything(JS::
|
|
|
+@@ -6914,18 +6911,18 @@ static bool ShouldCleanUpEverything(JS::
|
|
|
JSGCInvocationKind gckind) {
|
|
|
// During shutdown, we must clean everything up, for the sake of leak
|
|
|
// detection. When a runtime has no contexts, or we're doing a GC before a
|