Changeset 28855 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Dec 18, 2007, 11:42:49 PM (17 years ago)

Author:

[email protected]

Message:

Remove dead code due to removal of post-parse declaration discovery.

RS=Geoff.

Due to the removal of the declaration discovery pass after parsing we
no longer need any of the logic used for that discovery.

Location:

trunk/JavaScriptCore/kjs

Files:

• nodes.cpp (modified) (24 diffs)
• nodes.h (modified) (21 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -210 +210 @@
 
 Node::Node()
-    : m_mayHaveDeclarations(false)
-    , m_expectedReturnType(ObjectType)
+    : m_expectedReturnType(ObjectType)
 {
   m_line = lexer().lineNo();
@@ -217 +216 @@
 
 Node::Node(JSType expectedReturn)
-    : m_mayHaveDeclarations(false)
-    , m_expectedReturnType(expectedReturn)
+    : m_expectedReturnType(expectedReturn)
 {
     m_line = lexer().lineNo();
@@ -3451 +3449 @@
     , init(in)
 {
-    m_mayHaveDeclarations = true; 
 }
 
@@ -3460 +3457 @@
     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 
-    // instantiate it lazily. So we need to check here instead.
-    if (ident == stacks.exec->propertyNames().arguments)
-        return;
-
-    stacks.varStack.append(this); 
 }
 
@@ -3576 +3557 @@
 }
 
-void VarStatementNode::getDeclarations(DeclarationStacks& stacks)
-{
-    ASSERT(next->mayHaveDeclarations());
-    stacks.nodeStack.append(next.get());
-}
-
 // ------------------------------ Helper functions for handling Vectors of StatementNode -------------------------------
 
@@ -3592 +3567 @@
         stack.append((*it).get());
     }
-}
-
-static inline void statementListGetDeclarations(SourceElements& statements, DeclarationStacks& stacks)
-{
-    SourceElements::iterator it = statements.end();
-    SourceElements::iterator begin = statements.begin();
-    while (it != begin) {
-        --it;
-        if ((*it)->mayHaveDeclarations())
-            stacks.nodeStack.append((*it).get());
-    }
-}
-
-static inline Node* statementListInitializeDeclarationStack(SourceElements& statements, DeclarationStacks::NodeStack& stack)
-{
-    ASSERT(!stack.size()); // Otherwise, the removeLast() call might remove someone else's node.
-    
-    SourceElements::iterator it = statements.end();
-    SourceElements::iterator begin = statements.begin();
-    
-    while (it != begin) {
-        --it;
-        if ((*it)->mayHaveDeclarations())
-             stack.append((*it).get());
-    }
-
-    if (!stack.size())
-        return 0;
-
-    Node* n = stack.last();
-    stack.removeLast();
-    return n;
 }
 
@@ -3667 +3610 @@
 {
     ASSERT(m_children);
-    m_mayHaveDeclarations = true; 
 }
 
@@ -3673 +3615 @@
 {
     statementListPushFIFO(*m_children, nodeStack);
-}
-
-void BlockNode::getDeclarations(DeclarationStacks& stacks)
-{ 
-    statementListGetDeclarations(*m_children, stacks);
 }
 
@@ -3745 +3682 @@
 }
 
-void IfNode::getDeclarations(DeclarationStacks& stacks)
-{ 
-    if (statement2 && statement2->mayHaveDeclarations()) 
-        stacks.nodeStack.append(statement2.get()); 
-    if (statement1->mayHaveDeclarations()) 
-        stacks.nodeStack.append(statement1.get()); 
-}
-
 // ------------------------------ DoWhileNode ----------------------------------
 
@@ -3793 +3722 @@
 
     return Completion(); // work around gcc 4.0 bug
-}
-
-void DoWhileNode::getDeclarations(DeclarationStacks& stacks)
-{ 
-    if (statement->mayHaveDeclarations()) 
-        stacks.nodeStack.append(statement.get()); 
 }
 
@@ -3841 +3764 @@
 
     return Completion(); // work around gcc 4.0 bug
-}
-
-void WhileNode::getDeclarations(DeclarationStacks& stacks)
-{ 
-    if (statement->mayHaveDeclarations()) 
-        stacks.nodeStack.append(statement.get()); 
 }
 
@@ -3904 +3821 @@
 }
 
-void ForNode::getDeclarations(DeclarationStacks& stacks)
-{ 
-    if (statement->mayHaveDeclarations()) 
-        stacks.nodeStack.append(statement.get()); 
-    if (expr1 && expr1->mayHaveDeclarations()) 
-        stacks.nodeStack.append(expr1.get()); 
-}
-
 // ------------------------------ ForInNode ------------------------------------
 
@@ -3917 +3826 @@
   : init(0L), lexpr(l), expr(e), varDecl(0L), statement(s)
 {
-    m_mayHaveDeclarations = true; 
 }
 
@@ -3923 +3831 @@
   : ident(i), init(in), expr(e), statement(s)
 {
-  m_mayHaveDeclarations = true; 
-
   // for( var foo = bar in baz )
   varDecl = new VarDeclNode(ident, init.get(), VarDeclNode::Variable);
@@ -3937 +3843 @@
     if (varDecl)
         nodeStack.append(varDecl.get());
-}
-
-void ForInNode::getDeclarations(DeclarationStacks& stacks)
-{ 
-    if (statement->mayHaveDeclarations()) 
-        stacks.nodeStack.append(statement.get()); 
-    if (varDecl && varDecl->mayHaveDeclarations()) 
-        stacks.nodeStack.append(varDecl.get()); 
 }
 
@@ -4103 +4001 @@
 // ------------------------------ WithNode -------------------------------------
 
-void WithNode::getDeclarations(DeclarationStacks& stacks)
-{ 
-    if (statement->mayHaveDeclarations()) 
-        stacks.nodeStack.append(statement.get()); 
-}
-
 void WithNode::optimizeVariableAccess(SymbolTable&, DeclarationStacks::NodeStack& nodeStack)
 {
@@ -4141 +4033 @@
 }
 
-void CaseClauseNode::getDeclarations(DeclarationStacks& stacks)
-{ 
-    if (m_children) 
-        statementListGetDeclarations(*m_children, stacks);
-}
-
 // ECMA 12.11
 JSValue *CaseClauseNode::evaluate(ExecState *exec)
@@ -4174 +4060 @@
 }
 
-void ClauseListNode::getDeclarations(DeclarationStacks& stacks)
-{ 
-    if (next && next->mayHaveDeclarations()) 
-        stacks.nodeStack.append(next.get()); 
-    if (clause->mayHaveDeclarations()) 
-        stacks.nodeStack.append(clause.get()); 
-}
-
 // ------------------------------ CaseBlockNode --------------------------------
 
@@ -4189 +4067 @@
     , list2(l2)
 {
-    m_mayHaveDeclarations = true; 
 }
  
@@ -4200 +4077 @@
     if (list1)
         nodeStack.append(list1.get());
-}
-
-void CaseBlockNode::getDeclarations(DeclarationStacks& stacks) 
-{ 
-    if (list2 && list2->mayHaveDeclarations()) 
-        stacks.nodeStack.append(list2.get());
-    if (def && def->mayHaveDeclarations()) 
-        stacks.nodeStack.append(def.get()); 
-    if (list1 && list1->mayHaveDeclarations()) 
-        stacks.nodeStack.append(list1.get()); 
 }
 
@@ -4283 +4150 @@
 }
 
-void SwitchNode::getDeclarations(DeclarationStacks& stacks) 
-{ 
-    if (block->mayHaveDeclarations()) 
-        stacks.nodeStack.append(block.get()); 
-}
-
 // ECMA 12.11
 Completion SwitchNode::execute(ExecState *exec)
@@ -4311 +4172 @@
 {
     nodeStack.append(statement.get());
-}
-
-void LabelNode::getDeclarations(DeclarationStacks& stacks) 
-{ 
-    if (statement->mayHaveDeclarations()) 
-        stacks.nodeStack.append(statement.get()); 
 }
 
@@ -4359 +4214 @@
         nodeStack.append(finallyBlock.get());
     nodeStack.append(tryBlock.get());
-}
-
-void TryNode::getDeclarations(DeclarationStacks& stacks) 
-{ 
-    if (finallyBlock && finallyBlock->mayHaveDeclarations()) 
-        stacks.nodeStack.append(finallyBlock.get()); 
-    if (catchBlock && catchBlock->mayHaveDeclarations()) 
-        stacks.nodeStack.append(catchBlock.get()); 
-    if (tryBlock->mayHaveDeclarations()) 
-        stacks.nodeStack.append(tryBlock.get()); 
 }
 
@@ -4612 +4457 @@
 }
 
-void FuncDeclNode::getDeclarations(DeclarationStacks& stacks) 
-{
-    stacks.functionStack.append(this);
-}
-
 FunctionImp* FuncDeclNode::makeFunction(ExecState* exec)
 {

trunk/JavaScriptCore/kjs/nodes.h

@@ -139 +139 @@
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL = 0;
     virtual Precedence precedence() const = 0;
-
-    // Used for iterative, depth-first traversal of the node tree. Does not cross function call boundaries.
-    bool mayHaveDeclarations() const { return m_mayHaveDeclarations; }
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL { ASSERT_NOT_REACHED(); }
     
     // Used for iterative, depth-first traversal of the node tree. Does not cross function call boundaries.
@@ -168 +164 @@
 
     int m_line : 28;
-    bool m_mayHaveDeclarations : 1;
     unsigned m_expectedReturnType : 3; // JSType
   };
@@ -1715 +1710 @@
     void evaluateSingle(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
     virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
     PassRefPtr<VarDeclNode> releaseNext() KJS_FAST_CALL { return next.release(); }
@@ -1729 +1723 @@
   class VarStatementNode : public StatementNode {
   public:
-    VarStatementNode(VarDeclNode* l) KJS_FAST_CALL : next(l) { m_mayHaveDeclarations = true; }
+    VarStatementNode(VarDeclNode* l) KJS_FAST_CALL : next(l) { }
     virtual void optimizeVariableAccess(SymbolTable&, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
   private:
     RefPtr<VarDeclNode> next;
@@ -1753 +1746 @@
     virtual Completion execute(ExecState*) KJS_FAST_CALL  { ASSERT_NOT_REACHED(); return Completion(); }
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL  { ASSERT_NOT_REACHED(); }
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL  { ASSERT_NOT_REACHED(); }
     virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
   private:
@@ -1765 +1757 @@
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
   protected:
     OwnPtr<SourceElements> m_children;
@@ -1790 +1781 @@
   public:
     IfNode(ExpressionNode* e, StatementNode *s1, StatementNode *s2) KJS_FAST_CALL
-      : expr(e), statement1(s1), statement2(s2) { m_mayHaveDeclarations = statement1->mayHaveDeclarations() || (statement2 && statement2->mayHaveDeclarations()); }
+      : expr(e), statement1(s1), statement2(s2) { }
     virtual void optimizeVariableAccess(SymbolTable&, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
   private:
     RefPtr<ExpressionNode> expr;
@@ -1803 +1793 @@
   class DoWhileNode : public StatementNode {
   public:
-    DoWhileNode(StatementNode *s, ExpressionNode* e) KJS_FAST_CALL : statement(s), expr(e) { m_mayHaveDeclarations = true; }
+    DoWhileNode(StatementNode *s, ExpressionNode* e) KJS_FAST_CALL : statement(s), expr(e) { }
     virtual void optimizeVariableAccess(SymbolTable&, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
   private:
     RefPtr<StatementNode> statement;
@@ -1815 +1804 @@
   class WhileNode : public StatementNode {
   public:
-    WhileNode(ExpressionNode* e, StatementNode *s) KJS_FAST_CALL : expr(e), statement(s) { m_mayHaveDeclarations = true; }
+    WhileNode(ExpressionNode* e, StatementNode *s) KJS_FAST_CALL : expr(e), statement(s) { }
     virtual void optimizeVariableAccess(SymbolTable&, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
   private:
     RefPtr<ExpressionNode> expr;
@@ -1830 +1818 @@
       expr1(e1), expr2(e2), expr3(e3), statement(s)
     {
-        m_mayHaveDeclarations = true; 
         if (expr1)
             expr1->optimizeForUnnecessaryResult();
@@ -1840 +1827 @@
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
   private:
     RefPtr<ExpressionNode> expr1;
@@ -1855 +1841 @@
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
     VarDeclNode* getVarDecl() { return varDecl.get(); }
   private:
@@ -1898 +1883 @@
   class WithNode : public StatementNode {
   public:
-    WithNode(ExpressionNode* e, StatementNode* s) KJS_FAST_CALL : expr(e), statement(s) { m_mayHaveDeclarations = true; }
+    WithNode(ExpressionNode* e, StatementNode* s) KJS_FAST_CALL : expr(e), statement(s) { }
     virtual void optimizeVariableAccess(SymbolTable&, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
   private:
     RefPtr<ExpressionNode> expr;
@@ -1910 +1894 @@
   class LabelNode : public StatementNode {
   public:
-    LabelNode(const Identifier &l, StatementNode *s) KJS_FAST_CALL : label(l), statement(s) { m_mayHaveDeclarations = true; }
+    LabelNode(const Identifier &l, StatementNode *s) KJS_FAST_CALL : label(l), statement(s) { }
     virtual void optimizeVariableAccess(SymbolTable&, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
   private:
     Identifier label;
@@ -1933 +1916 @@
   public:
     TryNode(StatementNode *b, const Identifier &e, StatementNode *c, StatementNode *f) KJS_FAST_CALL
-      : tryBlock(b), exceptionIdent(e), catchBlock(c), finallyBlock(f) { m_mayHaveDeclarations = true; }
+      : tryBlock(b), exceptionIdent(e), catchBlock(c), finallyBlock(f) { }
     virtual void optimizeVariableAccess(SymbolTable&, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
   private:
     RefPtr<StatementNode> tryBlock;
@@ -2037 +2019 @@
   public:
     FuncDeclNode(const Identifier& i, FunctionBodyNode* b) KJS_FAST_CALL
-      : ident(i), body(b) { addParams(); m_mayHaveDeclarations = true; }
+      : ident(i), body(b) { addParams(); }
     FuncDeclNode(const Identifier& i, ParameterNode* p, FunctionBodyNode* b) KJS_FAST_CALL
-      : ident(i), param(p), body(b) { addParams(); m_mayHaveDeclarations = true; }
+      : ident(i), param(p), body(b) { addParams(); }
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
     ALWAYS_INLINE FunctionImp* makeFunction(ExecState*) KJS_FAST_CALL;
     Identifier ident;
@@ -2053 +2034 @@
     class CaseClauseNode : public Node {
   public:
-      CaseClauseNode(ExpressionNode* e) KJS_FAST_CALL : expr(e) { m_mayHaveDeclarations = true; }
+      CaseClauseNode(ExpressionNode* e) KJS_FAST_CALL : expr(e) { }
       CaseClauseNode(ExpressionNode* e, SourceElements* children) KJS_FAST_CALL
-      : expr(e), m_children(children) { m_mayHaveDeclarations = true; }
+      : expr(e), m_children(children) { }
       virtual void optimizeVariableAccess(SymbolTable&, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
       virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-      virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
       virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
 
@@ -2071 +2051 @@
     class ClauseListNode : public Node {
   public:
-      ClauseListNode(CaseClauseNode* c) KJS_FAST_CALL : clause(c) { m_mayHaveDeclarations = true; }
+      ClauseListNode(CaseClauseNode* c) KJS_FAST_CALL : clause(c) { }
       ClauseListNode(ClauseListNode* n, CaseClauseNode* c) KJS_FAST_CALL
-      : clause(c) { n->next = this; m_mayHaveDeclarations = true; }
+      : clause(c) { n->next = this; }
       virtual void optimizeVariableAccess(SymbolTable&, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
       CaseClauseNode* getClause() const KJS_FAST_CALL { return clause.get(); }
@@ -2079 +2059 @@
       virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
       PassRefPtr<ClauseListNode> releaseNext() KJS_FAST_CALL { return next.release(); }
-      virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
       virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
   private:
@@ -2093 +2072 @@
       Completion evalBlock(ExecState *exec, JSValue *input) KJS_FAST_CALL;
       virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-      virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
       virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
   private:
@@ -2103 +2081 @@
   class SwitchNode : public StatementNode {
   public:
-      SwitchNode(ExpressionNode* e, CaseBlockNode *b) KJS_FAST_CALL : expr(e), block(b) { m_mayHaveDeclarations = true; }
+      SwitchNode(ExpressionNode* e, CaseBlockNode *b) KJS_FAST_CALL : expr(e), block(b) { }
       virtual void optimizeVariableAccess(SymbolTable&, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
       virtual Completion execute(ExecState*) KJS_FAST_CALL;
       virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-      virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
   private:
       RefPtr<ExpressionNode> expr;