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

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.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/nodes.h

@@ -1950 +1950 @@
   };
 
-  // inherited by ProgramNode
-  class FunctionBodyNode : public BlockNode {
-  public:
-    FunctionBodyNode(SourceElements* children) KJS_FAST_CALL;
+  class ScopeNode : public BlockNode {
+  public:
+    ScopeNode(SourceElements*) KJS_FAST_CALL;
+
     int sourceId() KJS_FAST_CALL { return m_sourceId; }
     const UString& sourceURL() KJS_FAST_CALL { return m_sourceURL; }
 
+  protected:
+    void initializeDeclarationStacks(ExecState*) KJS_FAST_CALL;
+
+    DeclarationStacks::VarStack m_varStack;
+    DeclarationStacks::FunctionStack m_functionStack;
+
+  private:
+    UString m_sourceURL;
+    int m_sourceId;
+  };
+
+  class ProgramNode : public ScopeNode {
+  public:
+    ProgramNode(SourceElements*) KJS_FAST_CALL;
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
     
-    SymbolTable& symbolTable() { return m_symbolTable; }
-
-    void addParam(const Identifier& ident) KJS_FAST_CALL;
-    size_t numParams() const KJS_FAST_CALL { return m_parameters.size(); }
-    Identifier paramName(size_t pos) const KJS_FAST_CALL { return m_parameters[pos]; }
+  private:
+    ALWAYS_INLINE void processDeclarations(ExecState*) KJS_FAST_CALL;
+  };
+
+  class EvalNode : public ScopeNode {
+  public:
+    EvalNode(SourceElements*) KJS_FAST_CALL;
+    virtual Completion execute(ExecState*) KJS_FAST_CALL;
+    
+  private:
+    ALWAYS_INLINE void processDeclarations(ExecState*) KJS_FAST_CALL;
+  };
+
+  class FunctionBodyNode : public ScopeNode {
+  public:
+    FunctionBodyNode(SourceElements*) KJS_FAST_CALL;
+
+    virtual Completion execute(ExecState*) KJS_FAST_CALL;
+
+    SymbolTable& symbolTable() KJS_FAST_CALL { return m_symbolTable; }
+
+    Vector<Identifier>& parameters() KJS_FAST_CALL { return m_parameters; }
     UString paramString() const KJS_FAST_CALL;
-    Vector<Identifier>& parameters() KJS_FAST_CALL { return m_parameters; }
-    ALWAYS_INLINE void processDeclarations(ExecState*);
-    ALWAYS_INLINE void processDeclarationsForFunctionCode(ExecState*);
-    ALWAYS_INLINE void processDeclarationsForProgramCode(ExecState*);
-  private:
-    UString m_sourceURL;
-    int m_sourceId;
-
-    void initializeDeclarationStacks(ExecState*);
-    bool m_initializedDeclarationStacks;
-
-    void initializeSymbolTable();
-    bool m_initializedSymbolTable;
-    
-    void optimizeVariableAccess();
-    bool m_optimizedResolveNodes;
-    
-    // Properties that will go into the ActivationImp's local storage. (Used for initializing the ActivationImp.)
-    DeclarationStacks::VarStack m_varStack;
-    DeclarationStacks::FunctionStack m_functionStack;
+
+  private:
+    void initializeSymbolTable() KJS_FAST_CALL;
+    void optimizeVariableAccess() KJS_FAST_CALL;
+    ALWAYS_INLINE void processDeclarations(ExecState*) KJS_FAST_CALL;
+
+    bool m_initialized;
     Vector<Identifier> m_parameters;
-
-    // Mapping from property name -> local storage index. (Used once to transform the AST, and subsequently for residual slow case lookups.)
     SymbolTable m_symbolTable;
   };
 
-    class FuncExprNode : public ExpressionNode {
+  class FuncExprNode : public ExpressionNode {
   public:
     FuncExprNode(const Identifier& i, FunctionBodyNode* b, ParameterNode* p = 0) KJS_FAST_CALL 
@@ -2086 +2102 @@
   };
   
-  class ProgramNode : public FunctionBodyNode {
-  public:
-    ProgramNode(SourceElements* children) KJS_FAST_CALL;
-  };
-
   struct ElementList {
       ElementNode* head;