fix bad rebase which had no consequences

mozilla-release/patches/1464869-09-62a1.patch

@@ -2,7 +2,7 @@
 # User Sylvestre Ledru <sledru@mozilla.com>
 # Date 1528283054 -7200
 # Node ID fd9de8dd00a40f86c3e82ce2c1ec4b182c38be08
-# Parent  e94e7d7b262915b7d43dc252e130c61aa214e599
+# Parent  e262e119c758d92bf94b5fe11b695dc91ac748ef
 Bug 1464869 - Fix flake8/pep8 issue by hand in js/ r=jorendorff
 
 MozReview-Commit-ID: 7cbfMkdykXn
@@ -2468,8 +2468,7 @@ diff --git a/js/src/vm/make_unicode.py b/js/src/vm/make_unicode.py
      assert folding_shift == 6
  
      # verify correctness
-@@ -1451,18 +1454,18 @@ def make_irregexp_tables(version,
-         digit_chars = [ord(ch) for ch in string.digits]
+@@ -1452,17 +1455,18 @@ def make_irregexp_tables(version,
          assert all(ch <= MAX_ASCII for ch in digit_chars)
  
          # Characters in \w, 21.2.2.12 CharacterClassEscape.
@@ -2477,7 +2476,7 @@ diff --git a/js/src/vm/make_unicode.py b/js/src/vm/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 +
+         ignorecase_word_chars = (word_chars +
 -                                 [ch for ch in range(MAX_ASCII + 1, MAX_BMP + 1) if casefolds_to_ascii(ch)])
 +                                 [ch for ch in range(MAX_ASCII + 1, MAX_BMP + 1)
 +                                  if casefolds_to_ascii(ch)])
@@ -2489,7 +2488,7 @@ diff --git a/js/src/vm/make_unicode.py b/js/src/vm/make_unicode.py
          write(unicode_version_message.format(version))
          println('#include "irregexp/RegExpCharacters.h"')
          println('')
-@@ -1509,31 +1512,38 @@ def update_unicode(args):
+@@ -1509,31 +1513,38 @@ def update_unicode(args):
          print('\tVersion: %s' % version)
          print('\tDownload url: %s' % url)
  

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  9b7195f743e56565392f2024dd26e52a1217e657
+# Parent  805c9f69c4ce4132e4e6dbca95298e4fb5cb179a
 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
@@ -432,7 +432,7 @@ diff --git a/js/src/vm/make_unicode.py b/js/src/vm/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
@@ -603,6 +603,7 @@ diff --git a/js/src/vm/make_unicode.py b/js/src/vm/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)])
 -
@@ -648,7 +649,7 @@ diff --git a/js/src/vm/make_unicode.py b/js/src/vm/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,
@@ -666,7 +667,7 @@ diff --git a/js/src/vm/make_unicode.py b/js/src/vm/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,