SERVER-98608 Update MozJS to 115.19 (#31793)

GitOrigin-RevId: d40dc08384d90ceb56477d285c5b6c0c771c77e7

Author: leemaguire

README.third_party.md

@@ -39,7 +39,7 @@ a notice will be included in
 | [librdkafka]               | BSD-2-Clause      | 2.0.2             |                      |                                 |
 | [linenoise]                | BSD-3-Clause      | 6cdc775 + changes |                      |                ✗                |
 | [mongo-c-driver]           | Apache-2.0        | 1.27.6            |          ✗           |                ✗                |
-| [MozJS]                    | MPL-2.0           | ESR 115.7         |                      |                ✗                |
+| [Mozilla Firefox]          | MPL-2.0           | 115.19.0esr       |       unknown        |                ✗                |
 | [MurmurHash3]              | Public Domain     | Unknown + changes |          ✗           |                ✗                |
 | [ocspbuilder]              | MIT               | 0.10.2            |                      |                                 |
 | [ocspresponder]            | Apache-2.0        | 0.5.0             |                      |                                 |
@@ -77,7 +77,7 @@ a notice will be included in
 [libstemmer]: https://github.com/snowballstem/snowball
 [librdkafka]: https://github.com/confluentinc/librdkafka
 [linenoise]: https://github.com/antirez/linenoise
-[MozJS]: https://www.mozilla.org/en-US/security/known-vulnerabilities/firefox-esr
+[Mozilla Firefox]: https://www.mozilla.org/en-US/security/known-vulnerabilities/firefox-esr
 [MurmurHash3]: https://github.com/aappleby/smhasher/blob/master/src/MurmurHash3.cpp
 [ocspbuilder]: https://github.com/wbond/ocspbuilder
 [ocspresponder]: https://github.com/threema-ch/ocspresponder

sbom.json

@@ -942,15 +942,15 @@
         "name": "Organization: debian"
       },
       "name": "Mozilla Firefox",
-      "version": "115.7.0esr",
+      "version": "115.19.0esr",
       "licenses": [
         {
           "license": {
             "id": "MPL-2.0"
           }
         }
       ],
-      "purl": "pkg:deb/debian/firefox-esr@115.7.0esr-1",
+      "purl": "pkg:deb/debian/firefox-esr@115.19.0esr-1",
       "properties": [
         {
           "name": "internal:team_responsible",

src/third_party/mozjs/extract/js/src/builtin/intl/TimeZoneDataGenerated.h

@@ -1,5 +1,5 @@
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2023c
+// tzdata version = 2024a
 
 #ifndef builtin_intl_TimeZoneDataGenerated_h
 #define builtin_intl_TimeZoneDataGenerated_h
@@ -22,8 +22,14 @@ const char* const ianaZonesTreatedAsLinksByICU[] = {
     "America/Ensenada", // America/Tijuana [backzone]
     "America/Indiana/Indianapolis", // America/Indianapolis [northamerica]
     "America/Kentucky/Louisville", // America/Louisville [northamerica]
+    "America/Montreal", // America/Toronto [backzone]
+    "America/Nipigon", // America/Toronto [backzone]
     "America/Nuuk", // America/Godthab [europe]
+    "America/Pangnirtung", // America/Iqaluit [backzone]
+    "America/Rainy_River", // America/Winnipeg [backzone]
     "America/Rosario", // America/Cordoba [backzone]
+    "America/Thunder_Bay", // America/Toronto [backzone]
+    "America/Yellowknife", // America/Edmonton [backzone]
     "Asia/Chongqing", // Asia/Shanghai [backzone]
     "Asia/Harbin", // Asia/Shanghai [backzone]
     "Asia/Ho_Chi_Minh", // Asia/Saigon [asia]
@@ -34,13 +40,17 @@ const char* const ianaZonesTreatedAsLinksByICU[] = {
     "Asia/Yangon", // Asia/Rangoon [asia]
     "Atlantic/Faroe", // Atlantic/Faeroe [europe]
     "Atlantic/Jan_Mayen", // Arctic/Longyearbyen [backzone]
+    "Australia/Currie", // Australia/Hobart [backzone]
     "EST", // Etc/GMT+5 [northamerica]
     "Europe/Belfast", // Europe/London [backzone]
     "Europe/Kyiv", // Europe/Kiev [europe]
     "Europe/Tiraspol", // Europe/Chisinau [backzone]
+    "Europe/Uzhgorod", // Europe/Kiev [backzone]
+    "Europe/Zaporozhye", // Europe/Kiev [backzone]
     "HST", // Etc/GMT+10 [northamerica]
     "MST", // Etc/GMT+7 [northamerica]
     "Pacific/Chuuk", // Pacific/Truk [backzone]
+    "Pacific/Johnston", // Pacific/Honolulu [backzone]
     "Pacific/Kanton", // Pacific/Enderbury [australasia]
     "Pacific/Pohnpei", // Pacific/Ponape [backzone]
 };
@@ -67,7 +77,6 @@ const LinkAndTarget ianaLinksCanonicalizedDifferentlyByICU[] = {
     { "America/Lower_Princes", "America/Curacao" }, // America/Lower_Princes [backward]
     { "America/Marigot", "America/Port_of_Spain" }, // America/Marigot [backward]
     { "America/Mendoza", "America/Argentina/Mendoza" }, // America/Mendoza [backward]
-    { "America/Santa_Isabel", "America/Tijuana" }, // America/Santa_Isabel [backward]
     { "America/St_Barthelemy", "America/Port_of_Spain" }, // America/St_Barthelemy [backward]
     { "Antarctica/South_Pole", "Antarctica/McMurdo" }, // Pacific/Auckland [backward]
     { "Arctic/Longyearbyen", "Europe/Oslo" }, // Arctic/Longyearbyen [backward]

src/third_party/mozjs/extract/js/src/gc/GC.cpp

@@ -3100,20 +3100,14 @@ GCRuntime::MarkQueueProgress GCRuntime::processTestMarkQueue() {
         return QueueSuspended;
       }
 
-      // Mark the object and push it onto the stack.
-      size_t oldPosition = marker().stack.position();
-      marker().markAndTraverse<NormalMarkingOptions>(obj);
-
-      // If we overflow the stack here and delay marking, then we won't be
-      // testing what we think we're testing.
-      if (marker().stack.position() == oldPosition) {
+      // Mark the object.
+      AutoEnterOOMUnsafeRegion oomUnsafe;
+      if (!marker().markOneObjectForTest(obj)) {
+        // If we overflowed the stack here and delayed marking, then we won't be
+        // testing what we think we're testing.
         MOZ_ASSERT(obj->asTenured().arena()->onDelayedMarkingList());
-        AutoEnterOOMUnsafeRegion oomUnsafe;
         oomUnsafe.crash("Overflowed stack while marking test queue");
       }
-
-      SliceBudget unlimited = SliceBudget::unlimited();
-      marker().processMarkStackTop<NormalMarkingOptions>(unlimited);
     } else if (val.isString()) {
       JSLinearString* str = &val.toString()->asLinear();
       if (js::StringEqualsLiteral(str, "yield") && isIncrementalGc()) {
@@ -3604,10 +3598,7 @@ void GCRuntime::incrementalSlice(SliceBudget& budget, JS::GCReason reason,
 
     case State::Mark:
       if (mightSweepInThisSlice(budget.isUnlimited())) {
-        // Trace wrapper rooters before marking if we might start sweeping in
-        // this slice.
-        rt->mainContextFromOwnThread()->traceWrapperGCRooters(
-            marker().tracer());
+        prepareForSweepSlice(reason);
       }
 
       {
@@ -3656,13 +3647,8 @@ void GCRuntime::incrementalSlice(SliceBudget& budget, JS::GCReason reason,
       [[fallthrough]];
 
     case State::Sweep:
-      if (storeBuffer().mayHavePointersToDeadCells()) {
-        collectNurseryFromMajorGC(reason);
-      }
-
       if (initialState == State::Sweep) {
-        rt->mainContextFromOwnThread()->traceWrapperGCRooters(
-            marker().tracer());
+        prepareForSweepSlice(reason);
       }
 
       if (performSweepActions(budget) == NotFinished) {

src/third_party/mozjs/extract/js/src/gc/GCMarker.h

@@ -38,7 +38,9 @@ namespace gc {
 enum IncrementalProgress { NotFinished = 0, Finished };
 
 class AutoSetMarkColor;
+class AutoUpdateMarkStackRanges;
 struct Cell;
+class MarkStackIter;
 class ParallelMarker;
 class UnmarkGrayTracer;
 
@@ -117,6 +119,7 @@ class MarkStack {
    public:
     TaggedPtr() = default;
     TaggedPtr(Tag tag, Cell* ptr);
+    uintptr_t asBits() const;
     Tag tag() const;
     uintptr_t tagUnchecked() const;
     template <typename T>
@@ -136,10 +139,13 @@ class MarkStack {
     size_t start() const;
     TaggedPtr ptr() const;
 
+    void setStart(size_t newStart);
+    void setEmpty();
+
+   private:
     static constexpr size_t StartShift = 2;
     static constexpr size_t KindMask = (1 << StartShift) - 1;
 
-   private:
     uintptr_t startAndKind_;
     TaggedPtr ptr_;
   };
@@ -224,6 +230,13 @@ class MarkStack {
   // The maximum stack capacity to grow to.
   MainThreadOrGCTaskData<size_t> maxCapacity_{SIZE_MAX};
 #endif
+
+#ifdef DEBUG
+  MainThreadOrGCTaskData<bool> elementsRangesAreValid;
+  friend class js::GCMarker;
+#endif
+
+  friend class MarkStackIter;
 };
 
 static_assert(unsigned(SlotsOrElementsKind::Unused) ==
@@ -232,6 +245,25 @@ static_assert(unsigned(SlotsOrElementsKind::Unused) ==
               "difference between SlotsOrElementsRange::startAndKind_ and a "
               "tagged SlotsOrElementsRange");
 
+class MOZ_STACK_CLASS MarkStackIter {
+  MarkStack& stack_;
+  size_t pos_;
+
+ public:
+  explicit MarkStackIter(MarkStack& stack);
+
+  bool done() const;
+  void next();
+
+  MarkStack::Tag peekTag() const;
+  bool isSlotsOrElementsRange() const;
+  MarkStack::SlotsOrElementsRange& slotsOrElementsRange();
+
+ private:
+  size_t position() const;
+  MarkStack::TaggedPtr peekPtr() const;
+};
+
 // Bitmask of options to parameterize MarkingTracerT.
 namespace MarkingOptions {
 enum : uint32_t {
@@ -361,6 +393,8 @@ class GCMarker {
   void setCheckAtomMarking(bool check);
 
   bool shouldCheckCompartments() { return strictCompartmentChecking; }
+
+  bool markOneObjectForTest(JSObject* obj);
 #endif
 
   bool markCurrentColorInParallel(SliceBudget& budget);
@@ -403,6 +437,13 @@ class GCMarker {
   template <typename Tracer>
   void setMarkingStateAndTracer(MarkingState prev, MarkingState next);
 
+  // The mutator can shift object elements which could invalidate any elements
+  // index on the mark stack. Change the index to be relative to the elements
+  // allocation (to ignore shifted elements) while the mutator is running.
+  void updateRangesAtStartOfSlice();
+  void updateRangesAtEndOfSlice();
+  friend class gc::AutoUpdateMarkStackRanges;
+
   template <uint32_t markingOptions>
   bool processMarkStackTop(SliceBudget& budget);
   friend class gc::GCRuntime;

src/third_party/mozjs/extract/js/src/gc/GCRuntime.h

@@ -875,6 +875,7 @@ class GCRuntime {
   void sweepBackgroundThings(ZoneList& zones);
   void backgroundFinalize(JS::GCContext* gcx, Zone* zone, AllocKind kind,
                           Arena** empty);
+  void prepareForSweepSlice(JS::GCReason reason);
   void assertBackgroundSweepingFinished();
 
   bool allCCVisibleZonesWereCollected();