Changeset 88719 in webkit for trunk/Source/JavaScriptCore/parser/JSParser.cpp

Timestamp:

Jun 13, 2011, 3:38:22 PM (14 years ago)

Author:

[email protected]

Message:

2011-06-13 Oliver Hunt <​[email protected]>

Reviewed by Gavin Barraclough.

Make it possible to inline the common case of identifier lexing
​https://bugs.webkit.org/show_bug.cgi?id=62600

Add a lexing function that expects to lex an "normal" alpha numeric
identifier (that ignores keywords) so it's possible to inline the
common parsing cases. This comes out as a reasonable parsing speed
boost.

• parser/JSParser.cpp: (JSC::JSParser::nextExpectIdentifier): (JSC::JSParser::parseProperty): (JSC::JSParser::parseMemberExpression):
• parser/Lexer.cpp:
• parser/Lexer.h: (JSC::Lexer::makeIdentifier): (JSC::Lexer::lexExpectIdentifier):

File:

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

trunk/Source/JavaScriptCore/parser/JSParser.cpp

@@ -106 +106 @@
         m_lexer->setLastLineNumber(m_lastLine);
         m_token.m_type = m_lexer->lex(&m_token.m_data, &m_token.m_info, lexType, strictMode());
+    }
+    
+    ALWAYS_INLINE void nextExpectIdentifier(unsigned lexType = 0)
+    {
+        m_lastLine = m_token.m_info.line;
+        m_lastTokenEnd = m_token.m_info.endOffset;
+        m_lexer->setLastLineNumber(m_lastLine);
+        m_token.m_type = m_lexer->lexExpectIdentifier(&m_token.m_data, &m_token.m_info, lexType, strictMode());
     }
     
@@ -1708 +1716 @@
         const Identifier* ident = m_token.m_data.ident;
         if (complete || (wasIdent && (*ident == m_globalData->propertyNames->get || *ident == m_globalData->propertyNames->set)))
-            next(Lexer::IgnoreReservedWords);
+            nextExpectIdentifier(Lexer::IgnoreReservedWords);
         else
-            next(Lexer::IgnoreReservedWords | TreeBuilder::DontBuildKeywords);
+            nextExpectIdentifier(Lexer::IgnoreReservedWords | TreeBuilder::DontBuildKeywords);
 
         if (match(COLON)) {
@@ -2039 +2047 @@
             m_nonTrivialExpressionCount++;
             int expressionEnd = lastTokenEnd();
-            next(Lexer::IgnoreReservedWords | TreeBuilder::DontBuildKeywords);
+            nextExpectIdentifier(Lexer::IgnoreReservedWords | TreeBuilder::DontBuildKeywords);
             matchOrFail(IDENT);
             base = context.createDotAccess(base, m_token.m_data.ident, expressionStart, expressionEnd, tokenEnd());