fuzz fix only

frg/work-js/mozilla-release/patches/1762733-removepluginprefs-25312.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # User Frank-Rainer Grahl <frgrahl@gmx.net>
 # Date 1648602379 -7200
-# Parent  4eeec2a7ce8cdb79bfb33db12975c906ed67b138
+# Parent  fd265966f0a6faf7f5e145b5a10686b75e319197
 Bug 1762733 - Remove obsolete plugin prefs and code. r=IanN a=IanN
 
 SeaMonkey release branch only.
@@ -149,7 +149,7 @@ diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
 --- a/dom/base/nsContentUtils.h
 +++ b/dom/base/nsContentUtils.h
-@@ -2537,21 +2537,16 @@ public:
+@@ -2524,21 +2524,16 @@ public:
     */
    static void XPCOMShutdown();
  
@@ -610,7 +610,7 @@ diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/t
      "n_buckets": 10,
      "description": "Time spent on SQLite open() (ms)"
    },
-@@ -5515,45 +5460,16 @@
+@@ -5500,45 +5445,16 @@
    "PDF_VIEWER_TIME_TO_VIEW_MS": {
      "record_in_processes": ["main", "content"],
      "expires_in_version": "default",
@@ -656,7 +656,7 @@ diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/t
      "expires_in_version": "55",
      "kind": "enumerated",
      "keyed": true,
-@@ -8503,23 +8419,16 @@
+@@ -8488,23 +8404,16 @@
      "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
      "expires_in_version": "never",
      "kind": "exponential",
@@ -680,7 +680,7 @@ diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/t
    },
    "SERVICE_WORKER_WAS_SPAWNED": {
      "record_in_processes": ["main", "content"],
-@@ -9030,25 +8939,16 @@
+@@ -9015,25 +8924,16 @@
    "WEBRTC_ICE_CHECKING_RATE": {
      "record_in_processes": ["main", "content"],
      "alert_emails": ["webrtc-ice-telemetry-alerts@mozilla.com"],
@@ -749,7 +749,7 @@ diff --git a/toolkit/components/telemetry/app/TelemetryEnvironment.jsm b/toolkit
 diff --git a/toolkit/components/telemetry/histogram-whitelists.json b/toolkit/components/telemetry/histogram-whitelists.json
 --- a/toolkit/components/telemetry/histogram-whitelists.json
 +++ b/toolkit/components/telemetry/histogram-whitelists.json
-@@ -249,21 +249,16 @@
+@@ -248,21 +248,16 @@
      "PDF_VIEWER_FALLBACK_SHOWN",
      "PDF_VIEWER_FONT_TYPES",
      "PDF_VIEWER_FORM",
@@ -771,7 +771,7 @@ diff --git a/toolkit/components/telemetry/histogram-whitelists.json b/toolkit/co
      "PWMGR_MANAGE_COPIED_USERNAME",
      "PWMGR_MANAGE_DELETED",
      "PWMGR_MANAGE_DELETED_ALL",
-@@ -507,17 +502,16 @@
+@@ -506,17 +501,16 @@
      "FENNEC_SYNC11_MIGRATION_SENTINELS_SEEN",
      "FENNEC_SYNC_NUMBER_OF_SYNCS_COMPLETED",
      "FENNEC_SYNC_NUMBER_OF_SYNCS_FAILED",
@@ -789,7 +789,7 @@ diff --git a/toolkit/components/telemetry/histogram-whitelists.json b/toolkit/co
      "FORGET_SKIPPABLE_MAX",
      "FX_BOOKMARKS_TOOLBAR_INIT_MS",
      "FX_BROWSER_FULLSCREEN_USED",
-@@ -711,23 +705,16 @@
+@@ -709,23 +703,16 @@
      "PDF_VIEWER_PRINT",
      "PDF_VIEWER_STREAM_TYPES",
      "PDF_VIEWER_TIME_TO_VIEW_MS",
@@ -813,9 +813,9 @@ diff --git a/toolkit/components/telemetry/histogram-whitelists.json b/toolkit/co
      "PWMGR_MANAGE_COPIED_PASSWORD",
      "PWMGR_MANAGE_COPIED_USERNAME",
      "PWMGR_MANAGE_DELETED",
-@@ -1300,17 +1287,16 @@
+@@ -1297,17 +1284,16 @@
+     "FX_TOUCH_USED",
      "GEOLOCATION_ERROR",
-     "JS_TELEMETRY_ADDON_EXCEPTIONS",
      "MASTER_PASSWORD_ENABLED",
      "MEDIA_CODEC_USED",
      "NUMBER_OF_PROFILES",

frg/work-js/mozilla-release/patches/1814899-1029.patch

@@ -2,7 +2,7 @@
 # User Iain Ireland <iireland@mozilla.com>
 # Date 1676313190 0
 # Node ID 207a0ca14a754cccfed04e5ce55c513afb3d25a6
-# Parent  963b59f4f9b8ca667391f08687b8d04e820c173c
+# Parent  c64070b34de35fb0ba2b3b73d7e0d88a5c28f0e0
 Bug 1814899: Ensure more OsiSpace r=jandem, a=dmeehan
 
 Differential Revision: https://phabricator.services.mozilla.com/D169274
@@ -10,7 +10,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D169274
 diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
 --- a/js/src/jit/CodeGenerator.cpp
 +++ b/js/src/jit/CodeGenerator.cpp
-@@ -4367,16 +4367,17 @@ CodeGenerator::visitCallNative(LCallNati
+@@ -4368,16 +4368,17 @@ CodeGenerator::visitCallNative(LCallNati
      masm.passABIArg(argUintNReg);
      masm.passABIArg(argVpReg);
      JSNative native = target->native();
@@ -28,7 +28,7 @@ diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
      // Test for failure.
      masm.branchIfFalseBool(ReturnReg, masm.failureLabel());
  
-@@ -4518,16 +4519,17 @@ CodeGenerator::visitCallDOMNative(LCallD
+@@ -4519,16 +4520,17 @@ CodeGenerator::visitCallDOMNative(LCallD
  
      // Construct and execute call.
      masm.setupUnalignedABICall(argJSContext);
@@ -46,7 +46,7 @@ diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
                         JSReturnOperand);
      } else {
          // Test for failure.
-@@ -4658,16 +4660,17 @@ CodeGenerator::visitCallGeneric(LCallGen
+@@ -4659,16 +4661,17 @@ CodeGenerator::visitCallGeneric(LCallGen
      masm.bind(&thunk);
      {
          TrampolinePtr argumentsRectifier = gen->jitRuntime()->getArgumentsRectifier();
@@ -64,9 +64,9 @@ diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
                        "ReturnReg available as scratch after scripted calls");
          masm.switchToRealm(gen->realm->realmPtr(), ReturnReg);
      }
-@@ -4763,16 +4766,17 @@ CodeGenerator::visitCallKnown(LCallKnown
+@@ -4764,16 +4767,17 @@ CodeGenerator::visitCallKnown(LCallKnown
      // Construct the IonFramePrefix.
-     uint32_t descriptor = MakeFrameDescriptor(masm.framePushed(), JitFrame_IonJS,
+     uint32_t descriptor = MakeFrameDescriptor(masm.framePushed(), FrameType::IonJS,
                                                JitFrameLayout::Size());
      masm.Push(Imm32(call->numActualArgs()));
      masm.PushCalleeToken(calleereg, call->mir()->isConstructing());
@@ -82,7 +82,7 @@ diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
                        "ReturnReg available as scratch after scripted calls");
          masm.switchToRealm(gen->realm->realmPtr(), ReturnReg);
      }
-@@ -5106,16 +5110,17 @@ CodeGenerator::emitApplyGeneric(T* apply
+@@ -5107,16 +5111,17 @@ CodeGenerator::emitApplyGeneric(T* apply
              // Hardcode the address of the argumentsRectifier code.
              TrampolinePtr argumentsRectifier = gen->jitRuntime()->getArgumentsRectifier();
              masm.movePtr(argumentsRectifier, objreg);
@@ -100,7 +100,7 @@ diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
                            "ReturnReg available as scratch after scripted calls");
              masm.switchToRealm(gen->realm->realmPtr(), ReturnReg);
          }
-@@ -12216,16 +12221,17 @@ CodeGenerator::visitGetDOMProperty(LGetD
+@@ -12213,16 +12218,17 @@ CodeGenerator::visitGetDOMProperty(LGetD
      markSafepointAt(safepointOffset, ins);
  
      masm.setupUnalignedABICall(JSContextReg);
@@ -118,7 +118,7 @@ diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
                         JSReturnOperand);
      } else {
          masm.branchIfFalseBool(ReturnReg, masm.exceptionLabel());
-@@ -12335,16 +12341,17 @@ CodeGenerator::visitSetDOMProperty(LSetD
+@@ -12332,16 +12338,17 @@ CodeGenerator::visitSetDOMProperty(LSetD
      markSafepointAt(safepointOffset, ins);
  
      masm.setupUnalignedABICall(JSContextReg);
@@ -182,7 +182,7 @@ new file mode 100644
 diff --git a/js/src/jit/shared/CodeGenerator-shared.cpp b/js/src/jit/shared/CodeGenerator-shared.cpp
 --- a/js/src/jit/shared/CodeGenerator-shared.cpp
 +++ b/js/src/jit/shared/CodeGenerator-shared.cpp
-@@ -1108,28 +1108,28 @@ CodeGeneratorShared::ensureOsiSpace()
+@@ -1110,28 +1110,28 @@ CodeGeneratorShared::ensureOsiSpace()
      if (masm.currentOffset() - lastOsiPointOffset_ < Assembler::PatchWrite_NearCallSize()) {
          int32_t paddingSize = Assembler::PatchWrite_NearCallSize();
          paddingSize -= masm.currentOffset() - lastOsiPointOffset_;