Backed out changeset 4c043a955561 (bug 1791547) for causing bug 1792394 CLOSED TREE
authorCristian Tuns <ctuns@mozilla.com>
Fri, 30 Sep 2022 20:01:02 -0400
changeset 636765 e8b8ae48f130fdf5a623a0d2b8bc2e0e8f976b44
parent 636764 6bca2bb22edf29579ee3d8754ba0a954fb0b7ffc
child 636766 63fbc22d22232060e734e218ec6feec0bacc645a
push id170486
push userctuns@mozilla.com
push dateSat, 01 Oct 2022 00:01:31 +0000
treeherderautoland@e8b8ae48f130 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1791547, 1792394
milestone107.0a1
backs out4c043a955561bfc5ba18aea75489f23309989071
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 4c043a955561 (bug 1791547) for causing bug 1792394 CLOSED TREE
js/src/gc/Scheduling.h
js/src/shell/js.cpp
modules/libpref/init/all.js
--- a/js/src/gc/Scheduling.h
+++ b/js/src/gc/Scheduling.h
@@ -403,21 +403,17 @@ static const bool IncrementalGCEnabled =
 
 /* JSGC_PER_ZONE_GC_ENABLED */
 static const bool PerZoneGCEnabled = false;
 
 /* JSGC_COMPACTING_ENABLED */
 static const bool CompactingEnabled = true;
 
 /* JSGC_BALANCED_HEAP_LIMITS_ENABLED */
-#ifdef FUZZING
 static const bool BalancedHeapLimitsEnabled = false;
-#else
-static const bool BalancedHeapLimitsEnabled = true;
-#endif
 
 /* JSGC_INCREMENTAL_WEAKMAP_ENABLED */
 static const bool IncrementalWeakMapMarkingEnabled = true;
 
 /* JSGC_NURSERY_FREE_THRESHOLD_FOR_IDLE_COLLECTION */
 static const uint32_t NurseryFreeThresholdForIdleCollection = ChunkSize / 4;
 
 /* JSGC_NURSERY_FREE_THRESHOLD_FOR_IDLE_COLLECTION_PERCENT */
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -4079,20 +4079,16 @@ static void WorkerMain(UniquePtr<WorkerI
 
   js::SetWindowProxyClass(cx, &ShellWindowProxyClass);
 
   js::UseInternalJobQueues(cx);
 
   JS::SetHostCleanupFinalizationRegistryCallback(
       cx, ShellCleanupFinalizationRegistryCallback, sc);
 
-  if (fuzzingSafe) {
-    JS_SetGCParameter(cx, JSGC_BALANCED_HEAP_LIMITS_ENABLED, false);
-  }
-
   if (!JS::InitSelfHostedCode(cx)) {
     return;
   }
 
   EnvironmentPreparer environmentPreparer(cx);
 
   do {
     JS::RealmOptions realmOptions;
@@ -11130,20 +11126,16 @@ static int Shell(JSContext* cx, OptionPa
 
   if (op->getBoolOption("fuzzing-safe")) {
     fuzzingSafe = true;
   } else {
     fuzzingSafe =
         (getenv("MOZ_FUZZING_SAFE") && getenv("MOZ_FUZZING_SAFE")[0] != '0');
   }
 
-  if (fuzzingSafe) {
-    JS_SetGCParameter(cx, JSGC_BALANCED_HEAP_LIMITS_ENABLED, false);
-  }
-
 #ifdef DEBUG
   if (op->getBoolOption("differential-testing")) {
     JS::SetSupportDifferentialTesting(true);
   }
 #endif
 
   if (op->getBoolOption("disable-oom-functions")) {
     disableOOMFunctions = true;
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1042,17 +1042,17 @@ pref("javascript.options.mem.gc_high_fre
 
 // JSGC_HIGH_FREQUENCY_LARGE_HEAP_GROWTH
 pref("javascript.options.mem.gc_high_frequency_large_heap_growth", 150);
 
 // JSGC_LOW_FREQUENCY_HEAP_GROWTH
 pref("javascript.options.mem.gc_low_frequency_heap_growth", 150);
 
 // JSGC_BALANCED_HEAP_LIMITS_ENABLED
-pref("javascript.options.mem.gc_balanced_heap_limits", true);
+pref("javascript.options.mem.gc_balanced_heap_limits", false);
 
 // JSGC_HEAP_GROWTH_FACTOR
 pref("javascript.options.mem.gc_heap_growth_factor", 50);
 
 // JSGC_ALLOCATION_THRESHOLD
 pref("javascript.options.mem.gc_allocation_threshold_mb", 27);
 
 // JSGC_MALLOC_THRESHOLD_BASE