Changeset 27394 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Nov 3, 2007, 3:09:45 AM (18 years ago)

Author:

mjs

Message:

Reviewed by Oliver.

• remove VarDeclListNode and simplify VarDeclNode evaluation for 0.4% SunSpider speedup

• kjs/grammar.y:
• kjs/nodes.cpp: (KJS::VarDeclNode::optimizeVariableAccess): (KJS::VarDeclNode::getDeclarations): (KJS::VarDeclNode::handleSlowCase): (KJS::VarDeclNode::evaluateSingle): (KJS::VarDeclNode::evaluate): (KJS::VarStatementNode::execute):
• kjs/nodes.h: (KJS::VarDeclNode::): (KJS::VarStatementNode::):
• kjs/nodes2string.cpp: (KJS::VarDeclNode::streamTo):

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (7 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -56 +56 @@
 
 #define KJS_CHECKEXCEPTIONLIST \
+  if (exec->hadException()) { \
+    handleException(exec); \
+    return; \
+  }
+
+#define KJS_CHECKEXCEPTIONVOID \
   if (exec->hadException()) { \
     handleException(exec); \
@@ -2473 +2479 @@
 void VarDeclNode::optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack& nodeStack)
 {
+    if (next)
+        nodeStack.append(next.get());
     if (init)
         nodeStack.append(init.get());
 }
-    
+
 void VarDeclNode::getDeclarations(DeclarationStacks& stacks)
 {
+    if (next) {
+        ASSERT(next->mayHaveDeclarations());
+        stacks.nodeStack.append(next.get()); 
+    }
+
     // The normal check to avoid overwriting pre-existing values with variable
     // declarations doesn't work for the "arguments" property because we 
@@ -2488 +2501 @@
 }
 
-JSValue* VarDeclNode::handleSlowCase(ExecState* exec, const ScopeChain& chain, JSValue* val)
+void VarDeclNode::handleSlowCase(ExecState* exec, const ScopeChain& chain, JSValue* val)
 {
     ScopeChainIterator iter = chain.begin();
@@ -2513 +2526 @@
     
     base->put(exec, ident, val, flags);
-    return 0;
 }
 
 // ECMA 12.2
-JSValue* VarDeclNode::evaluate(ExecState* exec)
+inline void VarDeclNode::evaluateSingle(ExecState* exec)
 {
     const ScopeChain& chain = exec->scopeChain();
@@ -2536 +2548 @@
     } else if (init) {
         JSValue* val = init->evaluate(exec);
-        KJS_CHECKEXCEPTIONVALUE
+        KJS_CHECKEXCEPTIONVOID
             
         // if the variable object is the top of the scope chain, then that must
@@ -2552 +2564 @@
         variableObject->put(exec, ident, val, flags);
     }
-
-    // no caller of this function actually uses the return value. 
-    // FIXME: It would be better to change the inheritence hierarchy so this
-    // node doesn't even have an evaluate method, but instead a differently named
-    // one with a void return.
-    return 0;
-}
-
-// ------------------------------ VarDeclListNode ------------------------------
-
-void VarDeclListNode::optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack& nodeStack)
-{
-    if (next)
-        nodeStack.append(next.get());
-    nodeStack.append(var.get());
-}
-
-// ECMA 12.2
-JSValue *VarDeclListNode::evaluate(ExecState *exec)
-{
-  for (VarDeclListNode *n = this; n; n = n->next.get()) {
-    n->var->evaluate(exec);
-    KJS_CHECKEXCEPTIONVALUE
-  }
-  return jsUndefined();
-}
-
-void VarDeclListNode::getDeclarations(DeclarationStacks& stacks) 
-{
-    if (next) {
-        ASSERT(next->mayHaveDeclarations());
-        stacks.nodeStack.append(next.get()); 
+}
+
+JSValue* VarDeclNode::evaluate(ExecState* exec)
+{
+    evaluateSingle(exec);
+
+    if (VarDeclNode* n = next.get()) {
+        do {
+            n->evaluateSingle(exec);
+            KJS_CHECKEXCEPTIONVALUE
+            n = n->next.get();
+        } while (n);
     }
-    stacks.nodeStack.append(var.get());
+    return jsUndefined();
 }
 
@@ -2599 +2591 @@
 Completion VarStatementNode::execute(ExecState *exec)
 {
-  KJS_BREAKPOINT;
-
-  (void) next->evaluate(exec);
-  KJS_CHECKEXCEPTION
-
-  return Completion(Normal);
+    KJS_BREAKPOINT;
+
+    next->evaluate(exec);
+    KJS_CHECKEXCEPTION
+
+    return Completion(Normal);
 }