Changeset 27831 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 15, 2007, 4:40:24 PM (18 years ago)

Author:

[email protected]

Message:

<rdar://problem/5601548> REGRESSION: All SourceElements and their children leak after a syntax error

Reviewed by Darin.

Add a stub node to maintain the Vector of SourceElements until assignment.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/grammar.y (modified) (4 diffs)
• kjs/nodes.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-11-15  Oliver Hunt  <[email protected]>
+
+        Reviewed by Darin.
+
+        <rdar://problem/5601548> REGRESSION: All SourceElements and their children leak after a syntax error
+        
+        Add a stub node to maintain the Vector of SourceElements until assignment.
+
+        * kjs/grammar.y:
+        * kjs/nodes.h:
+        (KJS::SourceElementsStub::SourceElementsStub):
+        (KJS::SourceElementsStub::append):
+        (KJS::SourceElementsStub::release):
+        (KJS::SourceElementsStub::):
+        (KJS::SourceElementsStub::precedence):
+
 2007-11-15  Eric Seidel  <[email protected]>
 

trunk/JavaScriptCore/kjs/grammar.y

@@ -108 +108 @@
     ProgramNode*        programNode;
 
-    SourceElements*     sourceElements;
+    SourceElementsStub* sourceElements;
     PropertyList        propertyList;
     ArgumentList        argumentList;
@@ -661 +661 @@
 Block:
     '{' '}'                             { $$ = new BlockNode(new SourceElements); DBG($$, @1, @2); }
-  | '{' SourceElements '}'              { $$ = new BlockNode($2); DBG($$, @1, @3); }
+  | '{' SourceElements '}'              { $$ = new BlockNode($2->release()); DBG($$, @1, @3); }
 ;
 
@@ -822 +822 @@
 CaseClause:
     CASE Expr ':'                       { $$ = new CaseClauseNode($2); }
-  | CASE Expr ':' SourceElements        { $$ = new CaseClauseNode($2, $4); }
+  | CASE Expr ':' SourceElements        { $$ = new CaseClauseNode($2, $4->release()); }
 ;
 
 DefaultClause:
     DEFAULT ':'                         { $$ = new CaseClauseNode(0); }
-  | DEFAULT ':' SourceElements          { $$ = new CaseClauseNode(0, $3); }
+  | DEFAULT ':' SourceElements          { $$ = new CaseClauseNode(0, $3->release()); }
 ;
 
@@ -873 +873 @@
 FunctionBody:
     /* not in spec */           { $$ = new FunctionBodyNode(new SourceElements); }
-  | SourceElements              { $$ = new FunctionBodyNode($1); }
+  | SourceElements              { $$ = new FunctionBodyNode($1->release()); }
 ;
 
 Program:
     /* not in spec */                   { Parser::accept(new ProgramNode(new SourceElements)); }
-    | SourceElements                    { Parser::accept(new ProgramNode($1)); }
+    | SourceElements                    { Parser::accept(new ProgramNode($1->release())); }
 ;
 
 SourceElements:
-    SourceElement                       { $$ = new SourceElements; $$->append($1); }
+    SourceElement                       { $$ = new SourceElementsStub; $$->append($1); }
   | SourceElements SourceElement        { $$->append($2); }
 ;

trunk/JavaScriptCore/kjs/nodes.h

@@ -1729 +1729 @@
   typedef Vector<RefPtr<StatementNode> > SourceElements;
 
+  class SourceElementsStub : public Node {
+  public:
+    SourceElementsStub()
+      : m_sourceElements(new SourceElements)
+      {}
+    void append(StatementNode* element) { m_sourceElements->append(element); }
+    SourceElements* release() { 
+        SourceElements* elems = m_sourceElements.release(); 
+        return elems;
+    }
+    virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL { ASSERT_NOT_REACHED(); }
+    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:
+    OwnPtr<SourceElements> m_sourceElements;
+  };
+    
   class BlockNode : public StatementNode {
   public: