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

Timestamp:

Jun 10, 2015, 4:43:20 PM (10 years ago)

Author:

Yusuke Suzuki

Message:

JavaScript: Drop the “escaped reserved words as identifiers” compatibility measure
​https://bugs.webkit.org/show_bug.cgi?id=90678

Reviewed by Darin Adler.

After ES6, escaped reserved words in identifiers are prohibited.
After parsing Identifier, we should perform m_buffer16.shrink(0).

• parser/Lexer.cpp:

(JSC::Lexer<CharacterType>::parseIdentifierSlowCase):

• tests/mozilla/ecma_3/Unicode/uc-003.js:

(test): Deleted.

• tests/stress/reserved-word-with-escape.js: Added.

(testSyntax):
(testSyntaxError):

File:

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

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -1041 +1041 @@
 template<typename CharacterType> template<bool shouldCreateIdentifier> JSTokenType Lexer<CharacterType>::parseIdentifierSlowCase(JSTokenData* tokenData, unsigned lexerFlags, bool strictMode)
 {
-    const ptrdiff_t remaining = m_codeEnd - m_code;
     auto identifierStart = currentSourcePtr();
     bool bufferRequired = false;
@@ -1087 +1086 @@
         tokenData->ident = nullptr;
 
-    if (LIKELY(!bufferRequired && !(lexerFlags & LexerFlagsIgnoreReservedWords))) {
+    m_buffer16.shrink(0);
+
+    if (LIKELY(!(lexerFlags & LexerFlagsIgnoreReservedWords))) {
         ASSERT(shouldCreateIdentifier);
-        // Keywords must not be recognized if there was an \uXXXX in the identifier.
-        if (remaining < maxTokenLength) {
-            const HashTableValue* entry = m_vm->keywords->getKeyword(*ident);
-            ASSERT((remaining < maxTokenLength) || !entry);
-            if (!entry)
-                return IDENT;
-            JSTokenType token = static_cast<JSTokenType>(entry->lexerValue());
-            return (token != RESERVED_IF_STRICT) || strictMode ? token : IDENT;
-        }
-        return IDENT;
-    }
-
-    m_buffer16.shrink(0);
+        const HashTableValue* entry = m_vm->keywords->getKeyword(*ident);
+        if (!entry)
+            return IDENT;
+        JSTokenType token = static_cast<JSTokenType>(entry->lexerValue());
+        return (token != RESERVED_IF_STRICT) || strictMode ? token : IDENT;
+    }
+
     return IDENT;
 }