fixes

frg/work-js/mozilla-release/patches/TOP-NOBUG-REGEXP-38-1662073-82a1-25318.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # User Dmitry Butskoy <buc@buc.me>
 # Date 1690631137 -7200
-# Parent  84e6781da05af69b2f8672486a63626d09f3700f
+# Parent  fb7fad81df2af25e430fe00307a1a321aecb1976
 No Bug - Import new regexp V8 engine. r=frg a=frg
 
 diff --git a/js/src/builtin/RegExp.cpp b/js/src/builtin/RegExp.cpp
@@ -351,7 +351,7 @@ diff --git a/js/src/util/make_unicode.py b/js/src/util/make_unicode.py
  def write_special_casing_methods(unconditional_toupper, codepoint_table, println):
      def hexlit(n):
          """ Returns C++ hex-literal for |n|. """
-@@ -1300,215 +1287,16 @@ def splitbins(t):
+@@ -1300,216 +1287,16 @@ def splitbins(t):
      dump(t1, t2, shift, bytes)
  
      # exhaustively verify that the decomposition is correct
@@ -522,6 +522,7 @@ diff --git a/js/src/util/make_unicode.py b/js/src/util/make_unicode.py
 -        assert all(ch <= MAX_ASCII for ch in word_chars)
 -
 -        # Characters which case-fold to characters in \w.
+-        ignorecase_word_chars = (word_chars +
 -                                 [ch for ch in range(MAX_ASCII + 1, MAX_BMP + 1)
 -                                  if casefolds_to_ascii(ch)])
 -
@@ -567,7 +568,7 @@ diff --git a/js/src/util/make_unicode.py b/js/src/util/make_unicode.py
          baseurl = 'https://unicode.org/Public'
          if version == 'UNIDATA':
              url = '%s/%s' % (baseurl, version)
-@@ -1555,17 +1343,16 @@ def update_unicode(args):
+@@ -1556,17 +1343,16 @@ def update_unicode(args):
              same_upper_table, same_upper_index,
              non_bmp_lower_map, non_bmp_upper_map,
              non_bmp_space_set,
@@ -585,7 +586,7 @@ diff --git a/js/src/util/make_unicode.py b/js/src/util/make_unicode.py
  
      print('Generating...')
      make_unicode_file(unicode_version,
-@@ -1573,22 +1360,17 @@ def update_unicode(args):
+@@ -1574,22 +1360,17 @@ def update_unicode(args):
                        same_upper_table, same_upper_index,
                        folding_table, folding_index,
                        non_bmp_space_set,

frg/work-js/mozilla-release/patches/TOP-NOBUG-REGEXP-40-1644590-79a1-25318.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # User Dmitry Butskoy <buc@buc.me>
 # Date 1690631360 -7200
-# Parent  38f83f280e0914da76ab9c2e7c2e229c9d6bf263
+# Parent  3d8f72ef9787bcd25d3411d1be682b185da86aab
 No Bug - Import new regexp V8 engine. r=frg a=frg
 
 hawkeye116477 <hawkeye116477@gmail.com>
@@ -152,7 +152,7 @@ diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp
       */
      if (!matches->allocOrExpandArray(re->pairCount())) {
          ReportOutOfMemory(cx);
-@@ -820,54 +820,60 @@ bool RegExpShared::markedForTierUp(JSCon
+@@ -820,54 +820,61 @@ bool RegExpShared::markedForTierUp(JSCon
    }
    if (kind() != RegExpShared::Kind::RegExp) {
      return false;
@@ -215,7 +215,8 @@ diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp
 +/* static */
 +RegExpRunStatus RegExpShared::executeAtom(MutableHandleRegExpShared re,
 +                                          HandleLinearString input,
-+                                          size_t start, MatchPairs* matches) {
++                                          size_t start,
++                                          VectorMatchPairs* matches) {
 +  return ExecuteAtomImpl(re, input, start, matches);
  }
  
@@ -228,7 +229,7 @@ diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp
 diff --git a/js/src/vm/RegExpShared.h b/js/src/vm/RegExpShared.h
 --- a/js/src/vm/RegExpShared.h
 +++ b/js/src/vm/RegExpShared.h
-@@ -155,21 +155,20 @@ class RegExpShared : public gc::TenuredC
+@@ -155,20 +155,18 @@ class RegExpShared : public gc::TenuredC
  
      RegExpCompilation& compilation(bool latin1) {
          return compilationArray[CompilationIndex(latin1)];
@@ -239,11 +240,11 @@ diff --git a/js/src/vm/RegExpShared.h b/js/src/vm/RegExpShared.h
  
 -    static RegExpRunStatus executeAtom(JSContext* cx,
 -                                       MutableHandleRegExpShared re,
+-                                       HandleLinearString input,
+-                                       size_t start,
 +    static RegExpRunStatus executeAtom(MutableHandleRegExpShared re,
-                                        HandleLinearString input,
-                                        size_t start,
--                                       VectorMatchPairs* matches);
-+                                       MatchPairs* matches);
++                                       HandleLinearString input, size_t start,
+                                        VectorMatchPairs* matches);
  
      // Execute this RegExp on input starting from searchIndex, filling in matches.
      static RegExpRunStatus execute(JSContext* cx, MutableHandleRegExpShared res,
@@ -251,8 +252,7 @@ diff --git a/js/src/vm/RegExpShared.h b/js/src/vm/RegExpShared.h
                                     VectorMatchPairs* matches);
  
      // Register a table with this RegExpShared, and take ownership.
-     bool addTable(JitCodeTable table) {
-@@ -239,16 +238,20 @@ class RegExpShared : public gc::TenuredC
+@@ -244,16 +242,20 @@ class RegExpShared : public gc::TenuredC
      void traceChildren(JSTracer* trc);
      void discardJitCode();
      void finalize(FreeOp* fop);
@@ -273,7 +273,7 @@ diff --git a/js/src/vm/RegExpShared.h b/js/src/vm/RegExpShared.h
          return offsetof(RegExpShared, pairCount_);
      }
  
-@@ -394,16 +397,19 @@ class RegExpRealm
+@@ -399,16 +401,19 @@ class RegExpRealm
      static size_t offsetOfOptimizableRegExpPrototypeShape() {
          return offsetof(RegExpRealm, optimizableRegExpPrototypeShape_);
      }

frg/work-js/mozilla-release/patches/series

@@ -6637,7 +6637,6 @@ NOBUG-removemobilethemes-25318.patch
 1835524-bugsplat-mr-v1_6-25318.patch
 1858551-crashreporter-vendor-v1_2-25318.patch
 1858570-11505.patch
-1854076-11505.patch
 1721612-11506.patch
 1837261-2-version-beta-mr-25318.patch
 1861842-version-release-mr-25318.patch
@@ -9373,6 +9372,8 @@ LATER-1595212-72a1-incomplete.patch
 LATER-1431434-61a1.patch
 LATER-1392533-58a1.patch
 
+L-1854076-11505-causescrashes.patch
+
 LATER-9999999-wip-kill-telemetry.patch
 LATER-1425574-4-59a1.patch
 LATER-1468845-60-later.patch