Changeset 221167 in webkit for trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp

Timestamp:

Aug 24, 2017, 4:03:27 PM (8 years ago)

Author:

[email protected]

Message:

Enable moving fixed character class terms after fixed character terms for BMP only character classes
​https://bugs.webkit.org/show_bug.cgi?id=175958

Reviewed by Saam Barati.

Currently we don't perform the reordering optimiaztion of fixed character terms that
follow fixed character class terms for Unicode patterns.

This change allows that reordering when the character class contains only BMP
characters.

This fix is covered by existing tests.

• yarr/YarrJIT.cpp:

(JSC::Yarr::YarrGenerator::optimizeAlternative):

File:

• trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp

@@ -149 +149 @@
     void optimizeAlternative(PatternAlternative* alternative)
     {
-        if (!alternative->m_terms.size() || m_decodeSurrogatePairs)
+        if (!alternative->m_terms.size())
             return;
 
@@ -159 +159 @@
             if ((term.type == PatternTerm::TypeCharacterClass)
                 && (term.quantityType == QuantifierFixedCount)
-                && (!term.characterClass->m_hasNonBMPCharacters)
+                && (!m_decodeSurrogatePairs || !term.characterClass->m_hasNonBMPCharacters)
                 && (nextTerm.type == PatternTerm::TypePatternCharacter)
                 && (nextTerm.quantityType == QuantifierFixedCount)) {