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

Timestamp:

Feb 5, 2006, 11:49:05 PM (19 years ago)

Author:

mjs

Message:

Reviewed by Anders.

• fixed ~1100 KJS::Node leaked on layout tests ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7097

• kjs/internal.cpp: (KJS::Parser::noteNodeCycle): (KJS::Parser::removeNodeCycle): (KJS::clearNewNodes):
• kjs/internal.h:
• kjs/nodes.cpp: (ElementNode::breakCycle): (PropertyListNode::breakCycle): (ArgumentListNode::breakCycle): (StatListNode::StatListNode): (StatListNode::breakCycle): (VarDeclListNode::breakCycle): (BlockNode::BlockNode): (ClauseListNode::breakCycle): (CaseBlockNode::CaseBlockNode): (ParameterNode::breakCycle): (SourceElementsNode::SourceElementsNode): (SourceElementsNode::breakCycle):
• kjs/nodes.h: (KJS::Node::breakCycle): (KJS::ElementNode::ElementNode): (KJS::ArrayNode::ArrayNode): (KJS::PropertyListNode::PropertyListNode): (KJS::ObjectLiteralNode::ObjectLiteralNode): (KJS::ArgumentListNode::ArgumentListNode): (KJS::ArgumentsNode::ArgumentsNode): (KJS::VarDeclListNode::VarDeclListNode): (KJS::VarStatementNode::VarStatementNode): (KJS::ForNode::ForNode): (KJS::CaseClauseNode::CaseClauseNode): (KJS::ClauseListNode::ClauseListNode): (KJS::ParameterNode::ParameterNode): (KJS::FuncExprNode::FuncExprNode): (KJS::FuncDeclNode::FuncDeclNode):

File:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -336 +336 @@
 }
 
+void ElementNode::breakCycle() 
+{ 
+    next = 0;
+}
+
 // ------------------------------ ArrayNode ------------------------------------
 
@@ -403 +408 @@
 }
 
+void PropertyListNode::breakCycle() 
+{ 
+    next = 0;
+}
+
 // ------------------------------ PropertyNode -----------------------------
 // ECMA 11.1.5
@@ -474 +484 @@
 
   return l;
+}
+
+void ArgumentListNode::breakCycle() 
+{ 
+    next = 0;
 }
 
@@ -1436 +1451 @@
   : statement(s), next(this)
 {
-  setLoc(s->firstLine(), s->lastLine(), s->sourceId());
+    Parser::noteNodeCycle(this);
+    setLoc(s->firstLine(), s->lastLine(), s->sourceId());
 }
  
@@ -1476 +1492 @@
 }
 
+void StatListNode::breakCycle() 
+{ 
+    next = 0;
+}
+
 // ------------------------------ AssignExprNode -------------------------------
 
@@ -1558 +1579 @@
 }
 
+void VarDeclListNode::breakCycle() 
+{ 
+    next = 0;
+}
+
 // ------------------------------ VarStatementNode -----------------------------
 
@@ -1582 +1608 @@
   if (s) {
     source = s->next;
+    Parser::removeNodeCycle(source.get());
     s->next = 0;
     setLoc(s->firstLine(), s->lastLine(), s->sourceId());
@@ -2035 +2062 @@
 }
 
+void ClauseListNode::breakCycle() 
+{ 
+    next = 0;
+}
+
 // ------------------------------ CaseBlockNode --------------------------------
 
@@ -2042 +2074 @@
   if (l1) {
     list1 = l1->next;
+    Parser::removeNodeCycle(list1.get());
     l1->next = 0;
   } else {
@@ -2051 +2084 @@
   if (l2) {
     list2 = l2->next;
+    Parser::removeNodeCycle(list2.get());
     l2->next = 0;
   } else {
@@ -2237 +2271 @@
 }
 
+void ParameterNode::breakCycle() 
+{ 
+    next = 0;
+}
+
 // ------------------------------ FunctionBodyNode -----------------------------
 
@@ -2332 +2371 @@
   : node(s1), next(this)
 {
-  setLoc(s1->firstLine(), s1->lastLine(), s1->sourceId());
+    Parser::noteNodeCycle(this);
+    setLoc(s1->firstLine(), s1->lastLine(), s1->sourceId());
 }
 
@@ -2378 +2418 @@
 }
 
+void SourceElementsNode::breakCycle() 
+{ 
+    next = 0;
+}
+
 ProgramNode::ProgramNode(SourceElementsNode *s) : FunctionBodyNode(s)
 {