Browse Source

fuzz fix and edited patches qrefreshed

Frank-Rainer Grahl 4 months ago
parent
commit
01437e5818

+ 2 - 3
frg/work-js/mozilla-release/patches/1502733-1-66a1.patch

@@ -3,7 +3,7 @@
 # Date 1544876760 -7200
 #      Sat Dec 15 14:26:00 2018 +0200
 # Node ID 32aab5bf983a6245b581819421f76770ddd666e7
-# Parent  a2f9eb655455d9c8f0b5a256944bd4dabd314196
+# Parent  a8db267d9b75f5f545223c04c383c66c44874733
 Bug 1502733 - Part 1: Clean up and refactor GC system memory allocation functions. r=sfink
 
 diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp
@@ -57,7 +57,6 @@ diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp
  
 -#if defined(XP_UNIX)
 -// The addresses handed out by mmap may grow up or down.
--static mozilla::Atomic<int, mozilla::Relaxed> growthDirection(0);
 +/*
 + * System allocation functions may hand out regions of memory in increasing or
 + * decreasing order. This ordering is used as a hint during chunk alignment to
@@ -75,7 +74,7 @@ diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp
 +                           (defined(__NetBSD__) || defined(__linux__)))))
 +static mozilla::Atomic<int, mozilla::Relaxed> growthDirection(1);
 +#elif defined(XP_UNIX)
-+static mozilla::Atomic<int, mozilla::Relaxed> growthDirection(0);
+ static mozilla::Atomic<int, mozilla::Relaxed> growthDirection(0);
  #endif
  
 -// Data from OOM crashes shows there may be up to 24 chunksized but unusable

+ 1 - 1
frg/work-js/mozilla-release/patches/1502733-2-66a1.patch

@@ -3,7 +3,7 @@
 # Date 1547413800 -7200
 #      Sun Jan 13 23:10:00 2019 +0200
 # Node ID ac29aabfda36a42731a20f6ee687cdf739ab293f
-# Parent  f44ba832cf2c53ac1d1763d8816cfa1ea2b9be3f
+# Parent  25979884db5d8ad5018f88026094d44ef28b3b5b
 Bug 1502733 - Part 2: Allocate at randomly chosen aligned addresses on 64-bit platforms. r=sfink
 
 diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp

+ 1 - 1
frg/work-js/mozilla-release/patches/1502733-3-66a1.patch

@@ -3,7 +3,7 @@
 # Date 1547460840 -7200
 #      Mon Jan 14 12:14:00 2019 +0200
 # Node ID e5d3da4bdf58d26a21b311b6e02673c61aa84226
-# Parent  2473449aa163e8d5cd6b066a85e227b2b4cdee67
+# Parent  db513312777951d149359c2c38b726c9c5c4c528
 Bug 1502733 - Part 3: Tune new allocator to play nice with WASM. r=sfink
 
 diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp

+ 7 - 7
frg/work-js/mozilla-release/patches/1521000-1-js-66a1.patch

@@ -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

+ 2 - 3
frg/work-js/mozilla-release/patches/1638973-87a1.patch

@@ -2,7 +2,7 @@
 # User Henrik Skupin <mail@hskupin.info>
 # Date 1613247973 0
 # Node ID 2d603721703dd4ec94c7cf35c7c0605ad6c3c564
-# Parent  30c1f94d2f820d563c937cf134e4fd4c42a1dc5b
+# Parent  e2efeb25be3b68675129b6d77fb46eb9dfb7db76
 Bug 1638973 - Run 'mach marionette-test' with Python 3. r=jgraham
 
 Differential Revision: https://phabricator.services.mozilla.com/D105000
@@ -27,5 +27,4 @@ diff --git a/mach b/mach
      test
      wpt-metadata-merge
  "
- 
-
+ # Commands that are to be run with the system Python 3 instead of the