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

Timestamp:

Oct 25, 2007, 2:25:17 AM (18 years ago)

Author:

ggaren

Message:

Reviewed by Eric Seidel.

Slightly elaborated the differences between declaration procesing in
Function Code and Program Code.

.3% speedup on SunSpider.

• kjs/nodes.cpp: (KJS::FunctionBodyNode::processDeclarationsFunctionCode): (KJS::FunctionBodyNode::processDeclarationsProgramCode): Store a minimum set of attributes instead of recomputing all the time. Also, ignore m_parameters, since programs don't have arguments.

File:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -2618 +2618 @@
     JSObject* variableObject = context->variableObject();
 
+    int minAttributes = Internal | DontDelete;
+
     // The order of additions to the variable object here implicitly enforces the mutual exclusion described in ECMA 10.1.3.
     for (i = 0, size = m_varStack.size(); i < size; ++i) {
         VarDeclNode* node = m_varStack[i];
-        int flags = Internal | DontDelete;
+        int attributes = minAttributes;
         if (node->varType == VarDeclNode::Constant)
-            flags |= ReadOnly;
-        variableObject->put(exec, node->ident, jsUndefined(), flags);
+            attributes |= ReadOnly;
+        variableObject->put(exec, node->ident, jsUndefined(), attributes);
     }
 
@@ -2633 +2635 @@
     for (i = 0, size = m_functionStack.size(); i < size; ++i) {
         FuncDeclNode* node = m_functionStack[i];
-        variableObject->put(exec, node->ident, node->makeFunction(exec), Internal | DontDelete);
+        variableObject->put(exec, node->ident, node->makeFunction(exec), minAttributes);
     }
 }
@@ -2643 +2645 @@
     Context* context = exec->context();
     JSObject* variableObject = context->variableObject();
-
-    // The order of additions to the variable object here implicitly enforces the mutual exclusion described in ECMA 10.1.3.
+    
+    int minAttributes = Internal | (exec->context()->codeType() != EvalCode ? DontDelete : 0);
+
     for (i = 0, size = m_varStack.size(); i < size; ++i) {
         VarDeclNode* node = m_varStack[i];
-        if (!variableObject->hasProperty(exec, node->ident)) {
-            int flags = Internal;
-            if (context->codeType() != EvalCode)
-                flags |= DontDelete;
-            if (node->varType == VarDeclNode::Constant)
-                flags |= ReadOnly;
-            variableObject->put(exec, node->ident, jsUndefined(), flags);
-        }
+        if (variableObject->hasProperty(exec, node->ident))
+            continue;
+        int attributes = minAttributes;
+        if (node->varType == VarDeclNode::Constant)
+            attributes |= ReadOnly;
+        variableObject->put(exec, node->ident, jsUndefined(), attributes);
     }
-    
-    const List& args = *context->arguments();
-    for (i = 0, size = m_parameters.size(); i < size; ++i)
-        variableObject->put(exec, m_parameters[i], args[i], DontDelete);
+
+    ASSERT(!m_parameters.size());
 
     for (i = 0, size = m_functionStack.size(); i < size; ++i) {
         FuncDeclNode* node = m_functionStack[i];
-        variableObject->put(exec, node->ident, node->makeFunction(exec), Internal | (context->codeType() == EvalCode ? 0 : DontDelete));
+        variableObject->put(exec, node->ident, node->makeFunction(exec), minAttributes);
     }
 }