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

Timestamp:

Jan 31, 2014, 5:37:59 PM (12 years ago)

Author:

[email protected]

Message:

2014-01-31 Oliver Hunt <​[email protected]>

Rollout r163195 and related patches

File:

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

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -26 +26 @@
 #include "Lexer.h"
 
-#include "CommonIdentifiers.h"
+#include "JSFunctionInlines.h"
+
+#include "JSGlobalObjectFunctions.h"
 #include "Identifier.h"
-#include "JSFunctionInlines.h"
-#include "JSGlobalObjectFunctions.h"
 #include "NodeInfo.h"
 #include "Nodes.h"
@@ -91 +91 @@
     // Other types (only one so far)
     CharacterWhiteSpace,
-    CharacterPrivateIdentifierStart
 };
 
@@ -160 +159 @@
 /*  62 - >                  */ CharacterGreater,
 /*  63 - ?                  */ CharacterQuestion,
-/*  64 - @                  */ CharacterPrivateIdentifierStart,
+/*  64 - @                  */ CharacterInvalid,
 /*  65 - A                  */ CharacterIdentifierStart,
 /*  66 - B                  */ CharacterIdentifierStart,
@@ -488 +487 @@
 
 template <typename T>
-Lexer<T>::Lexer(VM* vm, JSParserStrictness strictness)
+Lexer<T>::Lexer(VM* vm)
     : m_isReparsing(false)
     , m_vm(vm)
-    , m_parsingBuiltinFunction(strictness == JSParseBuiltin)
 {
 }
@@ -756 +754 @@
     m_buffer16.append(static_cast<UChar>(c));
 }
-    
-#if !ASSERT_DISABLED
-bool isSafeIdentifier(VM& vm, const Identifier* ident)
-{
-    if (!ident)
-        return true;
-    /* Just block any use of suspicious identifiers.  This is intended to
-     * be used as a safety net while implementing builtins.
-     */
-    if (*ident == vm.propertyNames->call)
-        return false;
-    if (*ident == vm.propertyNames->apply)
-        return false;
-    if (*ident == vm.propertyNames->eval)
-        return false;
-    if (*ident == vm.propertyNames->Function)
-        return false;
-    return true;
-}
-#endif
-    
+
 template <>
 template <bool shouldCreateIdentifier> ALWAYS_INLINE JSTokenType Lexer<LChar>::parseIdentifier(JSTokenData* tokenData, unsigned lexerFlags, bool strictMode)
@@ -788 +766 @@
         }
     }
-    
-    bool isPrivateName = m_current == '@' && m_parsingBuiltinFunction;
-    if (isPrivateName)
-        shift();
-    
+
     const LChar* identifierStart = currentSourcePtr();
     unsigned identifierLineStart = currentLineStartOffset();
@@ -806 +780 @@
     const Identifier* ident = 0;
     
-    if (shouldCreateIdentifier || m_parsingBuiltinFunction) {
+    if (shouldCreateIdentifier) {
         int identifierLength = currentSourcePtr() - identifierStart;
         ident = makeIdentifier(identifierStart, identifierLength);
-        if (m_parsingBuiltinFunction) {
-            if (!isSafeIdentifier(*m_vm, ident) && !isPrivateName) {
-                m_lexErrorMessage = makeString("The use of '", ident->string(), "' is disallowed in builtin functions.");
-                return ERRORTOK;
-            }
-            if (isPrivateName)
-                ident = m_vm->propertyNames->getPrivateName(*ident);
-            else if (*ident == m_vm->propertyNames->undefinedKeyword)
-                tokenData->ident = &m_vm->propertyNames->undefinedKeywordPrivateName;
-            if (!ident)
-                return INVALID_PRIVATE_NAME_ERRORTOK;
-        }
+
         tokenData->ident = ident;
     } else
         tokenData->ident = 0;
 
-    if (UNLIKELY((remaining < maxTokenLength) && !(lexerFlags & LexerFlagsIgnoreReservedWords)) && !isPrivateName) {
+    if (UNLIKELY((remaining < maxTokenLength) && !(lexerFlags & LexerFlagsIgnoreReservedWords))) {
         ASSERT(shouldCreateIdentifier);
         if (remaining < maxTokenLength) {
@@ -852 +815 @@
         }
     }
-    
-    bool isPrivateName = m_current == '@' && m_parsingBuiltinFunction;
-    if (isPrivateName)
-        shift();
 
     const UChar* identifierStart = currentSourcePtr();
@@ -868 +827 @@
     
     if (UNLIKELY(m_current == '\\')) {
-        ASSERT(!isPrivateName);
         setOffsetFromSourcePtr(identifierStart, identifierLineStart);
         return parseIdentifierSlowCase<shouldCreateIdentifier>(tokenData, lexerFlags, strictMode);
@@ -880 +838 @@
     const Identifier* ident = 0;
     
-    if (shouldCreateIdentifier || m_parsingBuiltinFunction) {
+    if (shouldCreateIdentifier) {
         int identifierLength = currentSourcePtr() - identifierStart;
         if (isAll8Bit)
@@ -886 +844 @@
         else
             ident = makeIdentifier(identifierStart, identifierLength);
-        if (m_parsingBuiltinFunction) {
-            if (!isSafeIdentifier(*m_vm, ident) && !isPrivateName) {
-                m_lexErrorMessage = makeString("The use of '", ident->string(), "' is disallowed in builtin functions.");
-                return ERRORTOK;
-            }
-            if (isPrivateName)
-                ident = m_vm->propertyNames->getPrivateName(*ident);
-            else if (*ident == m_vm->propertyNames->undefinedKeyword)
-                tokenData->ident = &m_vm->propertyNames->undefinedKeywordPrivateName;
-            if (!ident)
-                return INVALID_PRIVATE_NAME_ERRORTOK;
-        }
+        
         tokenData->ident = ident;
     } else
         tokenData->ident = 0;
     
-    if (UNLIKELY((remaining < maxTokenLength) && !(lexerFlags & LexerFlagsIgnoreReservedWords)) && !isPrivateName) {
+    if (UNLIKELY((remaining < maxTokenLength) && !(lexerFlags & LexerFlagsIgnoreReservedWords))) {
         ASSERT(shouldCreateIdentifier);
         if (remaining < maxTokenLength) {
@@ -1712 +1659 @@
         FALLTHROUGH;
     case CharacterBackSlash:
-        parseIdent:
         if (lexerFlags & LexexFlagsDontBuildKeywords)
             token = parseIdentifier<false>(tokenData, lexerFlags, strictMode);
@@ -1725 +1671 @@
         m_lineStart = m_code;
         goto start;
-    case CharacterPrivateIdentifierStart:
-        if (m_parsingBuiltinFunction)
-            goto parseIdent;
-
-        FALLTHROUGH;
     case CharacterInvalid:
         m_lexErrorMessage = invalidCharacterMessage();