Changeset 27028 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 25, 2007, 1:11:31 AM (18 years ago)

Author:

ggaren

Message:

Reviewed by Maciej Stachowiak.

Make a fast path for declaration processing inside Function Code.

Lifted declaration processing code up from individual declaration nodes
and into processDeclarations.

Broke out processDeclarations into two cases, depending on the type of
code. This eliminates 2 branches, and facilitates more radical
divergeance in the future.

2.5% SunSpider speedup.

• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/nodes.cpp: (KJS::FunctionBodyNode::initializeDeclarationStacks): (KJS::FunctionBodyNode::processDeclarationsFunctionCode): (KJS::FunctionBodyNode::processDeclarationsProgramCode): (KJS::FunctionBodyNode::execute): (KJS::FuncDeclNode::makeFunction):
• kjs/nodes.h: (KJS::):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (1 diff)
• kjs/nodes.cpp (modified) (5 diffs)
• kjs/nodes.h (modified) (4 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-10-25  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Maciej Stachowiak.
+        
+        Make a fast path for declaration processing inside Function Code.
+        
+        Lifted declaration processing code up from individual declaration nodes
+        and into processDeclarations.
+        
+        Broke out processDeclarations into two cases, depending on the type of 
+        code. This eliminates 2 branches, and facilitates more radical 
+        divergeance in the future.
+        
+        2.5% SunSpider speedup.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * kjs/nodes.cpp:
+        (KJS::FunctionBodyNode::initializeDeclarationStacks):
+        (KJS::FunctionBodyNode::processDeclarationsFunctionCode):
+        (KJS::FunctionBodyNode::processDeclarationsProgramCode):
+        (KJS::FunctionBodyNode::execute):
+        (KJS::FuncDeclNode::makeFunction):
+        * kjs/nodes.h:
+        (KJS::):
+
 2007-10-25  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -1380 +1380 @@
                         isa = PBXProject;
                         buildConfigurationList = 149C277108902AFE008A9EFC /* Build configuration list for PBXProject "JavaScriptCore" */;
+                        compatibilityVersion = "Xcode 2.4";
                         hasScannedForEncodings = 1;
                         mainGroup = 0867D691FE84028FC02AAC07 /* JavaScriptCore */;

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1850 +1850 @@
 }
 
-void VarDeclNode::processDeclaration(ExecState* exec)
-{
-  Context* context = exec->context();
-  JSObject* variable = context->variableObject();
-
-  if (context->codeType() != FunctionCode)
-    if (variable->hasProperty(exec, ident))
-        return;
-
-  int flags = Internal;
-  if (context->codeType() != EvalCode)
-    flags |= DontDelete;
-  if (varType == VarDeclNode::Constant)
-    flags |= ReadOnly;
-  variable->put(exec, ident, jsUndefined(), flags);
-}
-
 // ------------------------------ VarDeclListNode ------------------------------
 
@@ -2628 +2611 @@
 }
 
-void FunctionBodyNode::processDeclarations(ExecState* exec)
-{
-    if (!m_initializedDeclarationStacks)
-        initializeDeclarationStacks(exec);
-
+void FunctionBodyNode::processDeclarationsFunctionCode(ExecState* exec)
+{
     size_t i, size;
 
-    JSObject* variableObject = exec->context()->variableObject();
-    const List& args = *exec->context()->arguments();
+    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.
-    for (i = 0, size = m_varStack.size(); i < size; ++i)
-        m_varStack[i]->processDeclaration(exec);
-
+    for (i = 0, size = m_varStack.size(); i < size; ++i) {
+        VarDeclNode* node = m_varStack[i];
+        int flags = Internal | DontDelete;
+        if (node->varType == VarDeclNode::Constant)
+            flags |= ReadOnly;
+        variableObject->put(exec, node->ident, jsUndefined(), flags);
+    }
+
+    const List& args = *context->arguments();
     for (i = 0, size = m_parameters.size(); i < size; ++i)
         variableObject->put(exec, m_parameters[i], args[i], DontDelete);
 
-    for (i = 0, size = m_functionStack.size(); i < size; ++i)
-        m_functionStack[i]->processDeclaration(exec);
+    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);
+    }
+}
+
+void FunctionBodyNode::processDeclarationsProgramCode(ExecState* exec)
+{
+    size_t i, size;
+
+    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.
+    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);
+        }
+    }
+    
+    const List& args = *context->arguments();
+    for (i = 0, size = m_parameters.size(); i < size; ++i)
+        variableObject->put(exec, m_parameters[i], args[i], DontDelete);
+
+    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));
+    }
 }
 
@@ -2667 +2685 @@
 }
 
+void FunctionBodyNode::processDeclarations(ExecState* exec)
+{
+    if (!m_initializedDeclarationStacks)
+        initializeDeclarationStacks(exec);
+
+    if (exec->context()->codeType() == FunctionCode)
+        processDeclarationsFunctionCode(exec);
+    else
+        processDeclarationsProgramCode(exec);
+}
+
 Completion FunctionBodyNode::execute(ExecState* exec)
 {
@@ -2686 +2715 @@
 }
 
-void FuncDeclNode::processDeclaration(ExecState* exec)
-{
-  Context *context = exec->context();
-
-  // TODO: let this be an object with [[Class]] property "Function"
-  FunctionImp *func = new FunctionImp(exec, ident, body.get(), context->scopeChain());
+FunctionImp* FuncDeclNode::makeFunction(ExecState* exec)
+{
+  FunctionImp *func = new FunctionImp(exec, ident, body.get(), exec->context()->scopeChain());
 
   JSObject *proto = exec->lexicalInterpreter()->builtinObject()->construct(exec, List::empty());
@@ -2698 +2724 @@
 
   func->put(exec, exec->propertyNames().length, jsNumber(body->numParams()), ReadOnly|DontDelete|DontEnum);
-
-  // ECMA 10.2.2
-  context->variableObject()->put(exec, ident, func, Internal | (context->codeType() == EvalCode ? 0 : DontDelete));
+  return func;
 }
 

trunk/JavaScriptCore/kjs/nodes.h

@@ -1005 +1005 @@
     JSValue* evaluate(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    ALWAYS_INLINE void processDeclaration(ExecState*) KJS_FAST_CALL;
     virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
-  private:
-    JSValue* handleSlowCase(ExecState*, const ScopeChain&, JSValue*) KJS_FAST_CALL KJS_NO_INLINE;
     Type varType;
     Identifier ident;
+  private:
+    JSValue* handleSlowCase(ExecState*, const ScopeChain&, JSValue*) KJS_FAST_CALL KJS_NO_INLINE;
     RefPtr<AssignExprNode> init;
   };
@@ -1242 +1241 @@
     UString paramString() const KJS_FAST_CALL;
     Vector<Identifier>& parameters() KJS_FAST_CALL { return m_parameters; }
-    ALWAYS_INLINE void processDeclarations(ExecState*) KJS_FAST_CALL;
+    ALWAYS_INLINE void processDeclarations(ExecState*);
+    ALWAYS_INLINE void processDeclarationsFunctionCode(ExecState*);
+    ALWAYS_INLINE void processDeclarationsProgramCode(ExecState*);
   private:
     UString m_sourceURL;
@@ -1250 +1251 @@
     bool m_initializedDeclarationStacks;
 
+    // Properties that will go into the ActivationImp's symbol table. (Used for initializing the ActivationImp.)
     DeclarationStacks::VarStack m_varStack;
     DeclarationStacks::FunctionStack m_functionStack;
@@ -1279 +1281 @@
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
-    ALWAYS_INLINE void processDeclaration(ExecState*) KJS_FAST_CALL;
+    ALWAYS_INLINE FunctionImp* makeFunction(ExecState*) KJS_FAST_CALL;
+    Identifier ident;
   private:
     void addParams() KJS_FAST_CALL;
-    Identifier ident;
     RefPtr<ParameterNode> param;
     RefPtr<FunctionBodyNode> body;