Attachment 370484 Details for Bug 198156 – Patch

[patch] Patch

bug-198156-20190522215041.patch (text/plain), 9.01 KB, created by Ross Kirsling on 2019-05-22 21:50:41 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2019-05-22 21:50:41 PDT

Size: 9.01 KB

patch

obsolete

>Subversion Revision: 245670
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 65d78fb10d803edb7900a7252df4e15d9f344cf9..43d815dcb4e788b2f67c7ac4ea25b381b6f43bf7 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-05-22  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        Lexer<T>::parseDecimal ought to ASSERT isASCIIDigit
>+        https://bugs.webkit.org/show_bug.cgi?id=198156
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * parser/Lexer.cpp:
>+        (JSC::Lexer<T>::parseDecimal):
>+        Add ASSERT.
>+
>+        (JSC::Lexer<T>::lexWithoutClearingLineTerminator):
>+        Check isASCIIDigit before calling parseDecimal.
>+        Also: - fix token enum values in a couple of error cases added in the last patch
>+              - add UNLIKELY for existing error cases that forgot to use it
>+              - simplify some control flow
>+
> 2019-05-22  Yusuke Suzuki  <ysuzuki@apple.com>
> 
>         [JSC] UnlinkedMetadataTable's offset table should be small
>diff --git a/Source/JavaScriptCore/parser/Lexer.cpp b/Source/JavaScriptCore/parser/Lexer.cpp
>index fe3f2098de12117a46c5b4ed8fad97769898a8a4..4913f182033f97357fd5edc8abb9426715c238a3 100644
>--- a/Source/JavaScriptCore/parser/Lexer.cpp
>+++ b/Source/JavaScriptCore/parser/Lexer.cpp
>@@ -1678,6 +1678,8 @@ ALWAYS_INLINE auto Lexer<T>::parseOctal() -> Optional<NumberParseResult>
> template <typename T>
> ALWAYS_INLINE auto Lexer<T>::parseDecimal() -> Optional<NumberParseResult>
> {
>+    ASSERT(isASCIIDigit(m_current));
>+
>     // Optimization: most decimal values fit into 4 bytes.
>     uint32_t decimalValue = 0;
> 
>@@ -2196,16 +2198,14 @@ start:
>         }
>         if (UNLIKELY(!parseNumberAfterDecimalPoint())) {
>             m_lexErrorMessage = "Non-number found after decimal point"_s;
>-            token = INVALID_NUMERIC_LITERAL_ERRORTOK;
>+            token = atEnd() ? UNTERMINATED_NUMERIC_LITERAL_ERRORTOK : INVALID_NUMERIC_LITERAL_ERRORTOK;
>             goto returnError;
>         }
>         token = DOUBLE;
>-        if (isASCIIAlphaCaselessEqual(m_current, 'e')) {
>-            if (!parseNumberAfterExponentIndicator()) {
>-                m_lexErrorMessage = "Non-number found after exponent indicator"_s;
>-                token = atEnd() ? UNTERMINATED_NUMERIC_LITERAL_ERRORTOK : INVALID_NUMERIC_LITERAL_ERRORTOK;
>-                goto returnError;
>-            }
>+        if (UNLIKELY(isASCIIAlphaCaselessEqual(m_current, 'e') && !parseNumberAfterExponentIndicator())) {
>+            m_lexErrorMessage = "Non-number found after exponent indicator"_s;
>+            token = atEnd() ? UNTERMINATED_NUMERIC_LITERAL_ERRORTOK : INVALID_NUMERIC_LITERAL_ERRORTOK;
>+            goto returnError;
>         }
>         size_t parsedLength;
>         tokenData->doubleValue = parseDouble(m_buffer8.data(), m_buffer8.size(), parsedLength);
>@@ -2222,7 +2222,7 @@ start:
>     case CharacterZero:
>         shift();
>         if (isASCIIAlphaCaselessEqual(m_current, 'x')) {
>-            if (!isASCIIHexDigit(peek(1))) {
>+            if (UNLIKELY(!isASCIIHexDigit(peek(1)))) {
>                 m_lexErrorMessage = "No hexadecimal digits after '0x'"_s;
>                 token = UNTERMINATED_HEX_NUMBER_ERRORTOK;
>                 goto returnError;
>@@ -2243,7 +2243,7 @@ start:
>                 tokenData->radix = 16;
>             }
> 
>-            if (isIdentStart(m_current)) {
>+            if (UNLIKELY(isIdentStart(m_current))) {
>                 m_lexErrorMessage = "No space between hexadecimal literal and identifier"_s;
>                 token = UNTERMINATED_HEX_NUMBER_ERRORTOK;
>                 goto returnError;
>@@ -2254,7 +2254,7 @@ start:
>             break;
>         }
>         if (isASCIIAlphaCaselessEqual(m_current, 'b')) {
>-            if (!isASCIIBinaryDigit(peek(1))) {
>+            if (UNLIKELY(!isASCIIBinaryDigit(peek(1)))) {
>                 m_lexErrorMessage = "No binary digits after '0b'"_s;
>                 token = UNTERMINATED_BINARY_NUMBER_ERRORTOK;
>                 goto returnError;
>@@ -2275,7 +2275,7 @@ start:
>                 tokenData->radix = 2;
>             }
> 
>-            if (isIdentStart(m_current)) {
>+            if (UNLIKELY(isIdentStart(m_current))) {
>                 m_lexErrorMessage = "No space between binary literal and identifier"_s;
>                 token = UNTERMINATED_BINARY_NUMBER_ERRORTOK;
>                 goto returnError;
>@@ -2287,7 +2287,7 @@ start:
>         }
> 
>         if (isASCIIAlphaCaselessEqual(m_current, 'o')) {
>-            if (!isASCIIOctalDigit(peek(1))) {
>+            if (UNLIKELY(!isASCIIOctalDigit(peek(1)))) {
>                 m_lexErrorMessage = "No octal digits after '0o'"_s;
>                 token = UNTERMINATED_OCTAL_NUMBER_ERRORTOK;
>                 goto returnError;
>@@ -2308,7 +2308,7 @@ start:
>                 tokenData->radix = 8;
>             }
> 
>-            if (isIdentStart(m_current)) {
>+            if (UNLIKELY(isIdentStart(m_current))) {
>                 m_lexErrorMessage = "No space between octal literal and identifier"_s;
>                 token = UNTERMINATED_OCTAL_NUMBER_ERRORTOK;
>                 goto returnError;
>@@ -2326,7 +2326,7 @@ start:
>         }
> 
>         record8('0');
>-        if (strictMode && isASCIIDigit(m_current)) {
>+        if (UNLIKELY(strictMode && isASCIIDigit(m_current))) {
>             m_lexErrorMessage = "Decimal integer literals with a leading zero are forbidden in strict mode"_s;
>             token = UNTERMINATED_OCTAL_NUMBER_ERRORTOK;
>             goto returnError;
>@@ -2341,40 +2341,37 @@ start:
>         FALLTHROUGH;
>     case CharacterNumber:
>         if (LIKELY(token != INTEGER && token != DOUBLE)) {
>-            auto parseNumberResult = parseDecimal();
>-            if (parseNumberResult && WTF::holds_alternative<double>(*parseNumberResult)) {
>-                tokenData->doubleValue = WTF::get<double>(*parseNumberResult);
>-                token = tokenTypeForIntegerLikeToken(tokenData->doubleValue);
>-            } else {
>-                if (parseNumberResult) {
>-                    ASSERT(WTF::get<const Identifier*>(*parseNumberResult));
>+            auto parseNumberResult = isASCIIDigit(m_current) ? parseDecimal() : WTF::nullopt;
>+            if (parseNumberResult) {
>+                if (WTF::holds_alternative<double>(*parseNumberResult)) {
>+                    tokenData->doubleValue = WTF::get<double>(*parseNumberResult);
>+                    token = tokenTypeForIntegerLikeToken(tokenData->doubleValue);
>+                } else {
>                     token = BIGINT;
>                     shift();
>                     tokenData->bigIntString = WTF::get<const Identifier*>(*parseNumberResult);
>                     tokenData->radix = 10;
>-                } else {
>-                    token = INTEGER;
>-                    if (m_current == '.') {
>-                        shift();
>-                        if (UNLIKELY(isASCIIDigit(m_current) && !parseNumberAfterDecimalPoint())) {
>-                            m_lexErrorMessage = "Non-number found after decimal point"_s;
>-                            token = INVALID_NUMERIC_LITERAL_ERRORTOK;
>-                            goto returnError;
>-                        }
>-                        token = DOUBLE;
>-                    }
>-                    if (isASCIIAlphaCaselessEqual(m_current, 'e')) {
>-                        if (!parseNumberAfterExponentIndicator()) {
>-                            m_lexErrorMessage = "Non-number found after exponent indicator"_s;
>-                            token = atEnd() ? UNTERMINATED_NUMERIC_LITERAL_ERRORTOK : INVALID_NUMERIC_LITERAL_ERRORTOK;
>-                            goto returnError;
>-                        }
>+                }
>+            } else {
>+                token = INTEGER;
>+                if (m_current == '.') {
>+                    shift();
>+                    if (UNLIKELY(isASCIIDigit(m_current) && !parseNumberAfterDecimalPoint())) {
>+                        m_lexErrorMessage = "Non-number found after decimal point"_s;
>+                        token = atEnd() ? UNTERMINATED_NUMERIC_LITERAL_ERRORTOK : INVALID_NUMERIC_LITERAL_ERRORTOK;
>+                        goto returnError;
>                     }
>-                    size_t parsedLength;
>-                    tokenData->doubleValue = parseDouble(m_buffer8.data(), m_buffer8.size(), parsedLength);
>-                    if (token == INTEGER)
>-                        token = tokenTypeForIntegerLikeToken(tokenData->doubleValue);
>+                    token = DOUBLE;
>+                }
>+                if (UNLIKELY(isASCIIAlphaCaselessEqual(m_current, 'e') && !parseNumberAfterExponentIndicator())) {
>+                    m_lexErrorMessage = "Non-number found after exponent indicator"_s;
>+                    token = atEnd() ? UNTERMINATED_NUMERIC_LITERAL_ERRORTOK : INVALID_NUMERIC_LITERAL_ERRORTOK;
>+                    goto returnError;
>                 }
>+                size_t parsedLength;
>+                tokenData->doubleValue = parseDouble(m_buffer8.data(), m_buffer8.size(), parsedLength);
>+                if (token == INTEGER)
>+                    token = tokenTypeForIntegerLikeToken(tokenData->doubleValue);
>             }
>         }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 198156: 370484 | 370490