Changeset 31147 in webkit for trunk/JavaScriptCore/kjs/lexer.cpp

Timestamp:

Mar 18, 2008, 9:23:21 PM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

2008-03-18 Darin Adler <Darin Adler>

Reviewed by Maciej.

• Speed up JavaScript built-in properties by changing the hash table to take advantage of the identifier objects

5% speedup for Acid3 test 26

• JavaScriptCore.exp: Updated.
• kjs/create_hash_table: Compute size of hash table large enough so that there are no collisions, but don't generate the hash table.
• kjs/identifier.h: Made the add function that returns a PassRefPtr public.
• kjs/lexer.cpp: (KJS::Lexer::lex): Updated for change to HashTable interface.
• kjs/lookup.cpp: (KJS::HashTable::changeKeysToIdentifiers): Added. Finds the identifier for each property so the equality comparision can be done with pointer comparision.
• kjs/lookup.h: Made the key be a union of char* with UString::Rep* so it can hold identifiers. Added a keysAreIdentifiers flag to the HashTable. Changed the Lookup functions to be member functions of HashTable instead.
• kjs/object.cpp: (KJS::JSObject::deleteProperty): Update for change to HashTable. (KJS::JSObject::findPropertyHashEntry): Ditto. (KJS::JSObject::getPropertyAttributes): Ditto. (KJS::JSObject::getPropertyNames): Ditto.

WebCore:

2008-03-18 Darin Adler <Darin Adler>

Reviewed by Maciej.

• Speed up JavaScript built-in properties by changing the hash table to take advantage of the identifier objects

5% speedup for Acid3 test 26

• bindings/js/JSDOMWindowBase.cpp: (WebCore::JSDOMWindowBase::getOwnPropertySlot): Update for change to HashTable. (WebCore::JSDOMWindowBase::put): Ditto.
• bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::customGetOwnPropertySlot): Ditto.
• bindings/js/JSHTMLInputElementBase.cpp: (WebCore::JSHTMLInputElementBase::getOwnPropertySlot): Ditto.
• bindings/js/JSHistoryCustom.cpp: (WebCore::JSHistory::customGetOwnPropertySlot): Ditto.
• bindings/js/JSLocation.cpp: (WebCore::JSLocation::customGetOwnPropertySlot): Ditto. (WebCore::JSLocation::put): Ditto.
• bindings/js/kjs_binding.cpp: (WebCore::nonCachingStaticFunctionGetter): Ditto.

• bindings/scripts/CodeGeneratorJS.pm: Same changes as in the create_hash_table script.

File:

• trunk/JavaScriptCore/kjs/lexer.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -524 +524 @@
 #endif
 
-  if (state != Identifier && eatNextIdentifier)
+  if (state != Identifier)
     eatNextIdentifier = false;
 
@@ -537 +537 @@
     break;
   case Other:
-    if(token == '}' || token == ';') {
+    if (token == '}' || token == ';')
       delimited = true;
+    break;
+  case Identifier:
+    // Apply anonymous-function hack below (eat the identifier).
+    if (eatNextIdentifier) {
+      eatNextIdentifier = false;
+      token = lex();
+      break;
     }
+    kjsyylval.ident = makeIdentifier(m_buffer16);
+    token = IDENT;
     break;
   case IdentifierOrKeyword:
-    if ((token = Lookup::find(&mainTable, m_buffer16.data(), m_buffer16.size())) < 0) {
-  case Identifier:
-      // Lookup for keyword failed, means this is an identifier
-      // Apply anonymous-function hack below (eat the identifier)
-      if (eatNextIdentifier) {
-        eatNextIdentifier = false;
-        token = lex();
-        break;
-      }
-      kjsyylval.ident = makeIdentifier(m_buffer16);
+    kjsyylval.ident = makeIdentifier(m_buffer16);
+    if ((token = mainTable.value(*kjsyylval.ident)) < 0) {
+      // Lookup for keyword failed, means this is an identifier.
       token = IDENT;
       break;
     }
-
-    eatNextIdentifier = false;
-    // Hack for "f = function somename() { ... }", too hard to get into the grammar
-    if (token == FUNCTION && lastToken == '=' )
-      eatNextIdentifier = true;
-
-    if (token == CONTINUE || token == BREAK ||
-        token == RETURN || token == THROW)
+    // Hack for "f = function somename() { ... }"; too hard to get into the grammar.
+    eatNextIdentifier = token == FUNCTION && lastToken == '=';
+    if (token == CONTINUE || token == BREAK || token == RETURN || token == THROW)
       restrKeyword = true;
     break;