Changeset 248831 in webkit for trunk/Source/JavaScriptCore/parser/Lexer.cpp

Timestamp:

Aug 18, 2019, 8:12:19 AM (6 years ago)

Author:

Darin Adler

Message:

Tidy up checks to see if a character is in the Latin-1 range by using isLatin1 consistently
​https://bugs.webkit.org/show_bug.cgi?id=200861

Reviewed by Ross Kirsling.

Source/JavaScriptCore:

• parser/Lexer.cpp:

(JSC::Lexer<T>::record8): Use isLatin1.
(JSC::assertCharIsIn8BitRange): Deleted. Can just assert isLatin1 directly.
(JSC::Lexer<T>::append8): Assert isLatin1 directly.
(JSC::characterRequiresParseStringSlowCase): Use isLatin1.

• parser/Lexer.h:

(JSC::Lexer<UChar>::isWhiteSpace): Ditto.

• runtime/LiteralParser.cpp:

(JSC::LiteralParser<CharType>::Lexer::lex): Ditto.
(JSC::isSafeStringCharacter): Ditto.

• runtime/Identifier.cpp:

(JSC::Identifier::add8): Ditto.

• runtime/LiteralParser.cpp:

(JSC::isSafeStringCharacter): Ditto.

• runtime/StringPrototype.cpp:

(JSC::stringProtoFuncRepeatCharacter): Ditto.

• yarr/YarrJIT.cpp:

(JSC::Yarr::YarrGenerator::generatePatternCharacterOnce): Ditto.
(JSC::Yarr::YarrGenerator::generatePatternCharacterGreedy): Ditto.
(JSC::Yarr::YarrGenerator::backtrackPatternCharacterNonGreedy): Ditto.

Source/WebCore:

• css/makeSelectorPseudoClassAndCompatibilityElementMap.py: Use isLatin1.
• css/makeSelectorPseudoElementsMap.py: Ditto.
• editing/TextIterator.cpp:

(WebCore::isNonLatin1Separator): Ditto.
(WebCore::isSeparator): Ditto.

• platform/network/HTTPParsers.cpp:

(WebCore::isValidReasonPhrase): Ditto.
(WebCore::isValidHTTPHeaderValue): Ditto.
(WebCore::isValidAcceptHeaderValue): Ditto.

• platform/text/TextCodecLatin1.cpp:

(WebCore::TextCodecLatin1::decode): Ditto.

• platform/text/TextCodecUTF8.cpp:

(WebCore::TextCodecUTF8::handlePartialSequence): Ditto.
(WebCore::TextCodecUTF8::decode): Ditto.

Source/WebKitLegacy/mac:

• Misc/WebKitNSStringExtras.mm:

(canUseFastRenderer): Use isLatin1.

Source/WTF:

• wtf/text/StringBuilder.cpp:

(WTF::StringBuilder::appendCharacters): Use isLatin1 and also call append rather than
calling appendCharacters, since it's the same thing, inlined, and removes the need for
a local variable. Also tweaked the idiom of the code using memcpy.
(WTF::StringBuilder::canShrink const): Reworded a comment.

• wtf/text/StringBuilder.h:

(WTF::StringBuilder::append): Use isLatin1.

• wtf/text/StringCommon.h:

(WTF::isLatin1): Moved this function template here so it can be used here.
(WTF::find): Use isLatin1.

• wtf/text/StringImpl.h:

(WTF::isLatin1): Deleted. Moved to StringCommon.h.
(WTF::reverseFind): Use isLatin1.
(WTF::isSpaceOrNewline): Ditto.

File:

• trunk/Source/JavaScriptCore/parser/Lexer.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -851 +851 @@
 inline void Lexer<T>::record8(int c)
 {
-    ASSERT(c >= 0);
-    ASSERT(c <= 0xFF);
+    ASSERT(isLatin1(c));
     m_buffer8.append(static_cast<LChar>(c));
-}
-
-template <typename T>
-inline void assertCharIsIn8BitRange(T c)
-{
-    UNUSED_PARAM(c);
-    ASSERT(c >= 0);
-    ASSERT(c <= 0xFF);
-}
-
-template <>
-inline void assertCharIsIn8BitRange(UChar c)
-{
-    UNUSED_PARAM(c);
-    ASSERT(c <= 0xFF);
-}
-
-template <>
-inline void assertCharIsIn8BitRange(LChar)
-{
 }
 
@@ -885 +864 @@
     for (size_t i = 0; i < length; i++) {
         T c = p[i];
-        assertCharIsIn8BitRange(c);
+        ASSERT(isLatin1(c));
         rawBuffer[i] = c;
     }
@@ -1161 +1140 @@
 static ALWAYS_INLINE bool characterRequiresParseStringSlowCase(UChar character)
 {
-    return character < 0xE || character > 0xFF;
+    return character < 0xE || !isLatin1(character);
 }