Changeset 225771 in webkit

Timestamp:

Dec 11, 2017 9:47:18 PM (6 years ago)

Author:

msaboff@apple.com

Message:

REGRESSION(r225683): Chakra test failure in es6/regex-unicode.js for 32bit builds
​https://bugs.webkit.org/show_bug.cgi?id=180685

Reviewed by Saam Barati.

The characterClass->m_anyCharacter check at the top of checkCharacterClass() caused
the character class check to return true without reading the character. Given that
the character could be a surrogate pair, we need to read the character even if we
don't have the check it.

• yarr/YarrInterpreter.cpp:

(JSC::Yarr::Interpreter::testCharacterClass):
(JSC::Yarr::Interpreter::checkCharacterClass):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• yarr/YarrInterpreter.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-12-11  Michael Saboff  <msaboff@apple.com>
+
+        REGRESSION(r225683): Chakra test failure in es6/regex-unicode.js for 32bit builds
+        https://bugs.webkit.org/show_bug.cgi?id=180685
+
+        Reviewed by Saam Barati.
+
+        The characterClass->m_anyCharacter check at the top of checkCharacterClass() caused
+        the character class check to return true without reading the character.  Given that
+        the character could be a surrogate pair, we need to read the character even if we
+        don't have the check it.
+
+        * yarr/YarrInterpreter.cpp:
+        (JSC::Yarr::Interpreter::testCharacterClass):
+        (JSC::Yarr::Interpreter::checkCharacterClass):
+
 2017-12-11  Saam Barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/yarr/YarrInterpreter.cpp

@@ -353 +353 @@
         };
 
+        if (characterClass->m_anyCharacter)
+            return true;
+
         const size_t thresholdForBinarySearch = 6;
 
@@ -410 +413 @@
     bool checkCharacterClass(CharacterClass* characterClass, bool invert, unsigned negativeInputOffset)
     {
-        if (characterClass->m_anyCharacter)
-            return !invert;
-
         bool match = testCharacterClass(characterClass, input.readChecked(negativeInputOffset));
         return invert ? !match : match;