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

Timestamp:

Dec 10, 2007, 9:47:41 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

Reviewed by Sam Weinig.

Split this:

FunctionBodyNode

^|

ProgramNode

into this:

ScopeNode

^{| | |}

FunctionBodyNode ProgramNode EvalNode

in preparation for specializing each class more while optimizing global
variable access.

Also removed some cruft from the FunctionBodyNode interface to simplify
things.

SunSpider says this patch is a .8% speedup, which seems reasonable,
since it eliminates a few branches and adds KJS_FAST_CALL in a few
places.

Layout tests and JS tests pass. Also, this baby builds on Windows! (Qt
mileage may vary...)

WebCore:

Reviewed by Sam Weinig.

Updated for rename in JavaScriptCore.

• bridge/mac/WebCoreScriptDebugger.mm: (-[WebCoreScriptCallFrame scopeChain]): (-[WebCoreScriptCallFrame functionName]): (-[WebCoreScriptCallFrame evaluateWebScript:]):

WebKit/win:

Reviewed by Sam Weinig.

Updated for rename in JavaScriptCore.

• WebScriptCallFrame.cpp: (WebScriptCallFrame::functionName): (WebScriptCallFrame::valueByEvaluatingJavaScriptFromString):

File:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -266 +266 @@
 static inline int currentSourceId(ExecState* exec)
 {
-    return exec->currentBody()->sourceId();
+    return exec->scopeNode()->sourceId();
 }
 
@@ -272 +272 @@
 static inline const UString& currentSourceURL(ExecState* exec)
 {
-    return exec->currentBody()->sourceURL();
+    return exec->scopeNode()->sourceURL();
 }
 
@@ -4401 +4401 @@
 // ------------------------------ FunctionBodyNode -----------------------------
 
-FunctionBodyNode::FunctionBodyNode(SourceElements* children)
+ScopeNode::ScopeNode(SourceElements* children)
     : BlockNode(children)
     , m_sourceURL(parser().sourceURL())
     , m_sourceId(parser().sourceId())
-    , m_initializedDeclarationStacks(false)
-    , m_initializedSymbolTable(false)
-    , m_optimizedResolveNodes(false)
-{
-}
-
-void FunctionBodyNode::initializeDeclarationStacks(ExecState* exec)
+{
+}
+
+ProgramNode::ProgramNode(SourceElements* children)
+    : ScopeNode(children)
+{
+}
+
+EvalNode::EvalNode(SourceElements* children)
+    : ScopeNode(children)
+{
+}
+
+FunctionBodyNode::FunctionBodyNode(SourceElements* children)
+    : ScopeNode(children)
+    , m_initialized(false)
+{
+}
+
+void ScopeNode::initializeDeclarationStacks(ExecState* exec)
 {
     DeclarationStacks::NodeStack nodeStack;
@@ -4430 +4443 @@
         nodeStack.shrink(size);
     }
-
-    m_initializedDeclarationStacks = true;
 }
 
@@ -4448 +4459 @@
     for (i = 0, size = m_functionStack.size(); i < size; ++i)
         m_symbolTable.set(m_functionStack[i]->ident.ustring().rep(), count++);
-
-    m_initializedSymbolTable = true;
 }
 
@@ -4469 +4478 @@
         nodeStack.shrink(size);
     }
-
-    m_optimizedResolveNodes = true;
 }
 
 void FunctionBodyNode::processDeclarations(ExecState* exec)
 {
-    if (!m_initializedDeclarationStacks)
+    if (!m_initialized) {
         initializeDeclarationStacks(exec);
-
-    if (exec->codeType() == FunctionCode)
-        processDeclarationsForFunctionCode(exec);
-    else
-        processDeclarationsForProgramCode(exec);
-}
-
-void FunctionBodyNode::processDeclarationsForFunctionCode(ExecState* exec)
-{
-    if (!m_initializedSymbolTable)
         initializeSymbolTable();
-
-    if (!m_optimizedResolveNodes)
         optimizeVariableAccess();
+        
+        m_initialized = true;
+    }
 
     LocalStorage& localStorage = exec->variableObject()->localStorage();
@@ -4521 +4519 @@
 }
 
-void FunctionBodyNode::processDeclarationsForProgramCode(ExecState* exec)
-{
+void ProgramNode::processDeclarations(ExecState* exec)
+{
+    initializeDeclarationStacks(exec);
+
     size_t i, size;
 
-    JSObject* variableObject = exec->variableObject();
-    
-    int minAttributes = Internal | (exec->codeType() != EvalCode ? DontDelete : 0);
+    JSVariableObject* variableObject = exec->variableObject();
+    
+    int minAttributes = Internal | DontDelete;
 
     for (i = 0, size = m_varStack.size(); i < size; ++i) {
@@ -4539 +4539 @@
     }
 
-    ASSERT(!m_parameters.size());
-
     for (i = 0, size = m_functionStack.size(); i < size; ++i) {
         FuncDeclNode* node = m_functionStack[i];
@@ -4547 +4545 @@
 }
 
-void FunctionBodyNode::addParam(const Identifier& ident)
-{
-  m_parameters.append(ident);
+void EvalNode::processDeclarations(ExecState* exec)
+{
+    initializeDeclarationStacks(exec);
+
+    size_t i, size;
+
+    JSVariableObject* variableObject = exec->variableObject();
+    
+    int minAttributes = Internal;
+
+    for (i = 0, size = m_varStack.size(); i < size; ++i) {
+        VarDeclNode* node = m_varStack[i];
+        if (variableObject->hasProperty(exec, node->ident))
+            continue;
+        int attributes = minAttributes;
+        if (node->varType == VarDeclNode::Constant)
+            attributes |= ReadOnly;
+        variableObject->put(exec, node->ident, jsUndefined(), attributes);
+    }
+
+    for (i = 0, size = m_functionStack.size(); i < size; ++i) {
+        FuncDeclNode* node = m_functionStack[i];
+        variableObject->put(exec, node->ident, node->makeFunction(exec), minAttributes);
+    }
 }
 
@@ -4555 +4574 @@
 {
   UString s("");
-  size_t count = numParams();
+  size_t count = m_parameters.size();
   for (size_t pos = 0; pos < count; ++pos) {
     if (!s.isEmpty())
         s += ", ";
-    s += paramName(pos).ustring();
+    s += m_parameters[pos].ustring();
   }
 
   return s;
+}
+
+Completion ProgramNode::execute(ExecState* exec)
+{
+    processDeclarations(exec);
+    return ScopeNode::execute(exec);
+}
+
+Completion EvalNode::execute(ExecState* exec)
+{
+    processDeclarations(exec);
+    return ScopeNode::execute(exec);
 }
 
@@ -4576 +4607 @@
     }    
     
-    Completion completion = BlockNode::execute(exec);
+    Completion completion = ScopeNode::execute(exec);
     
     if (Debugger* dbg = exec->dynamicGlobalObject()->debugger()) {
@@ -4597 +4628 @@
 {
   for (ParameterNode *p = param.get(); p != 0L; p = p->nextParam())
-    body->addParam(p->ident());
+    body->parameters().append(p->ident());
 }
 
@@ -4613 +4644 @@
   func->put(exec, exec->propertyNames().prototype, proto, Internal|DontDelete);
 
-  func->put(exec, exec->propertyNames().length, jsNumber(body->numParams()), ReadOnly|DontDelete|DontEnum);
+  func->put(exec, exec->propertyNames().length, jsNumber(body->parameters().size()), ReadOnly|DontDelete|DontEnum);
   return func;
 }
@@ -4628 +4659 @@
 {
   for (ParameterNode *p = param.get(); p != 0L; p = p->nextParam())
-    body->addParam(p->ident());
+    body->parameters().append(p->ident());
 }
 
@@ -4657 +4688 @@
 }
 
-ProgramNode::ProgramNode(SourceElements* children)
-    : FunctionBodyNode(children)
-{
-}
-
-}
+} // namespace KJS