Changeset 131956 in webkit for trunk/Source/JavaScriptCore/parser

Timestamp:

Oct 19, 2012, 4:23:34 PM (13 years ago)

Author:

[email protected]

Message:

Lexer should create 8 bit Identifiers for RegularExpressions and ASCII identifiers
​https://bugs.webkit.org/show_bug.cgi?id=99855

Reviewed by Filip Pizlo.

Added makeIdentifier helpers that will always make an 8 bit Identifier or make an
Identifier that is the same size as the template parameter. Used the first in the fast
path when looking for a JS identifier and the second when scanning regular expressions.

• parser/Lexer.cpp:

(JSC::::scanRegExp):

• parser/Lexer.h:

(Lexer):
(JSC::::makeIdentifierSameType):
(JSC::::makeLCharIdentifier):
(JSC::::lexExpectIdentifier):

Location:

trunk/Source/JavaScriptCore/parser

Files:

• Lexer.cpp (modified) (2 diffs)
• Lexer.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -1618 +1618 @@
     }
 
-    pattern = makeIdentifier(m_buffer16.data(), m_buffer16.size());
+    pattern = makeIdentifierSameType(m_buffer16.data(), m_buffer16.size());
     m_buffer16.resize(0);
 
@@ -1626 +1626 @@
     }
 
-    flags = makeIdentifier(m_buffer16.data(), m_buffer16.size());
+    flags = makeIdentifierSameType(m_buffer16.data(), m_buffer16.size());
     m_buffer16.resize(0);
 

trunk/Source/JavaScriptCore/parser/Lexer.h

@@ -147 +147 @@
     ALWAYS_INLINE const Identifier* makeIdentifier(const LChar* characters, size_t length);
     ALWAYS_INLINE const Identifier* makeIdentifier(const UChar* characters, size_t length);
+    ALWAYS_INLINE const Identifier* makeLCharIdentifier(const LChar* characters, size_t length);
+    ALWAYS_INLINE const Identifier* makeLCharIdentifier(const UChar* characters, size_t length);
+    ALWAYS_INLINE const Identifier* makeIdentifierSameType(const UChar* characters, size_t length);
     ALWAYS_INLINE const Identifier* makeIdentifierLCharFromUChar(const UChar* characters, size_t length);
 
@@ -240 +243 @@
 
 template <>
+ALWAYS_INLINE const Identifier* Lexer<LChar>::makeIdentifierSameType(const UChar* characters, size_t length)
+{
+    return &m_arena->makeIdentifierLCharFromUChar(m_globalData, characters, length);
+}
+
+template <>
+ALWAYS_INLINE const Identifier* Lexer<UChar>::makeIdentifierSameType(const UChar* characters, size_t length)
+{
+    return &m_arena->makeIdentifier(m_globalData, characters, length);
+}
+
+template <>
 ALWAYS_INLINE void Lexer<LChar>::setCodeStart(const StringImpl* sourceString)
 {
@@ -255 +270 @@
 template <typename T>
 ALWAYS_INLINE const Identifier* Lexer<T>::makeIdentifierLCharFromUChar(const UChar* characters, size_t length)
+{
+    return &m_arena->makeIdentifierLCharFromUChar(m_globalData, characters, length);
+}
+
+template <typename T>
+ALWAYS_INLINE const Identifier* Lexer<T>::makeLCharIdentifier(const LChar* characters, size_t length)
+{
+    return &m_arena->makeIdentifier(m_globalData, characters, length);
+}
+
+template <typename T>
+ALWAYS_INLINE const Identifier* Lexer<T>::makeLCharIdentifier(const UChar* characters, size_t length)
 {
     return &m_arena->makeIdentifierLCharFromUChar(m_globalData, characters, length);
@@ -294 +321 @@
         tokenData->ident = 0;
     else
-        tokenData->ident = makeIdentifier(start, ptr - start);
+        tokenData->ident = makeLCharIdentifier(start, ptr - start);
     tokenLocation->line = m_lineNumber;
     tokenLocation->startOffset = start - m_codeStart;