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

Timestamp:

Jun 10, 2015, 9:43:13 AM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r185414.
​https://bugs.webkit.org/show_bug.cgi?id=145844

broke debug and jsc tests (Requested by alexchristensen on
#webkit).

Reverted changeset:

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

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;
@@ -1086 +1087 @@
         tokenData->ident = nullptr;
 
-    if (LIKELY(!(lexerFlags & LexerFlagsIgnoreReservedWords))) {
+    if (LIKELY(!bufferRequired && !(lexerFlags & LexerFlagsIgnoreReservedWords))) {
         ASSERT(shouldCreateIdentifier);
-        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;
+        // 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;
     }