Changeset 243949 in webkit

Timestamp:

Apr 5, 2019, 3:08:22 PM (7 years ago)

Author:

Alan Coon

Message:

Revert r243839. rdar://problem/49654398

Location:

tags/Safari-608.1.15

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/regexp-unicode-expected.txt (modified) (1 diff)
• LayoutTests/js/script-tests/regexp-unicode.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/yarr/YarrJIT.cpp (modified) (3 diffs)

tags/Safari-608.1.15/LayoutTests/ChangeLog

@@ +1 @@
+2019-04-05  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Revert r243839. rdar://problem/49654398
+
 2019-04-03  Timothy Hatcher  <timothy@apple.com>
 

tags/Safari-608.1.15/LayoutTests/js/regexp-unicode-expected.txt

@@ -149 +149 @@
 PASS "𐌑𐌐𐌑".match(/[𐌁𐌑]+a|[𐌐𐌑]+./iu)[0] is "𐌑𐌐𐌑"
 PASS "𐌑𐌐𐌑".match(/[𐌁𐌑]+?a|[𐌐𐌑]+?./iu)[0] is "𐌑𐌐"
-PASS "𐌑𐌐𐌑".match(/[𐌁𐌑]+?a$|[𐌐𐌑]+?.$/iu)[0] is "𐌑𐌐𐌑"
-PASS "𐌑𐌐𐌑".match(/[𐌁𐌑x]+a|[𐌐𐌑x]+./iu)[0] is "𐌑𐌐𐌑"
-PASS "𐌑𐌐𐌑".match(/[𐌁𐌑x]+?a|[𐌐𐌑x]+?./iu)[0] is "𐌑𐌐"
 PASS "C83|НАЧАТЬ".match(re8)[0] is "C83|НАЧАТЬ"
 PASS "This.Is.16.Chars|НАЧАТЬ".match(re8)[0] is "This.Is.16.Chars|НАЧАТЬ"

tags/Safari-608.1.15/LayoutTests/js/script-tests/regexp-unicode.js

@@ -206 +206 @@
 shouldBe('"\u{10311}\u{10310}\u{10311}".match(/[\u{10301}\u{10311}]+a|[\u{10310}\u{10311}]+./iu)[0]', '"\u{10311}\u{10310}\u{10311}"');
 shouldBe('"\u{10311}\u{10310}\u{10311}".match(/[\u{10301}\u{10311}]+?a|[\u{10310}\u{10311}]+?./iu)[0]', '"\u{10311}\u{10310}"');
-shouldBe('"\u{10311}\u{10310}\u{10311}".match(/[\u{10301}\u{10311}]+?a$|[\u{10310}\u{10311}]+?.$/iu)[0]', '"\u{10311}\u{10310}\u{10311}"');
-shouldBe('"\u{10311}\u{10310}\u{10311}".match(/[\u{10301}\u{10311}x]+a|[\u{10310}\u{10311}x]+./iu)[0]', '"\u{10311}\u{10310}\u{10311}"');
-shouldBe('"\u{10311}\u{10310}\u{10311}".match(/[\u{10301}\u{10311}x]+?a|[\u{10310}\u{10311}x]+?./iu)[0]', '"\u{10311}\u{10310}"');
 
 var re8 = new  RegExp("^([0-9a-z\.]{3,16})\\|\u{041d}\u{0410}\u{0427}\u{0410}\u{0422}\u{042c}", "ui");

tags/Safari-608.1.15/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-04-05  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Revert r243839. rdar://problem/49654398
+
 2019-04-03  Yusuke Suzuki  <ysuzuki@apple.com>
 

tags/Safari-608.1.15/Source/JavaScriptCore/yarr/YarrJIT.cpp

@@ -1850 +1850 @@
         JumpList failures;
         Label loop(this);
-#ifdef JIT_UNICODE_EXPRESSIONS
-        if (term->characterClass->hasOneCharacterSize() && !term->invert() && term->characterClass->hasNonBMPCharacters()) {
-            move(TrustedImm32(1), character);
-            failures.append(checkNotEnoughInput(character));
-        } else
-#endif
-            failures.append(atEndOfInput());
+        failures.append(atEndOfInput());
 
         if (term->invert()) {
@@ -1963 +1957 @@
         m_backtrackingState.link(this);
 
-#ifdef JIT_UNICODE_EXPRESSIONS
         if (m_decodeSurrogatePairs) {
             if (!term->characterClass->hasOneCharacterSize() || term->invert())
@@ -1969 +1962 @@
             loadFromFrame(term->frameLocation + BackTrackInfoCharacterClass::matchAmountIndex(), countRegister);
         }
-#endif
 
         nonGreedyFailures.append(atEndOfInput());