From f3dd05ca03c9c649bf5b8891b73cda1e11ab914e Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 9 Apr 2002 05:15:33 +0000 Subject: [PATCH] Clean up the ownership model a bit so that nodes actually get deleted more frequently. This still leaks edges quite a bit, but it leaks no nodes (I think). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2190 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/InstrSched/SchedGraph.cpp | 20 ++++++++------------ lib/Target/SparcV9/InstrSched/SchedGraph.cpp | 20 ++++++++------------ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/lib/CodeGen/InstrSched/SchedGraph.cpp b/lib/CodeGen/InstrSched/SchedGraph.cpp index daf4a49bb83..28679bfbdc8 100644 --- a/lib/CodeGen/InstrSched/SchedGraph.cpp +++ b/lib/CodeGen/InstrSched/SchedGraph.cpp @@ -168,6 +168,9 @@ SchedGraphNode::SchedGraphNode(unsigned int _nodeId, /*dtor*/ SchedGraphNode::~SchedGraphNode() { + // for each node, delete its out-edges + std::for_each(beginOutEdges(), endOutEdges(), + deleter); } void SchedGraphNode::dump(int indent=0) const { @@ -233,16 +236,9 @@ SchedGraph::SchedGraph(const BasicBlock* bb, SchedGraph::~SchedGraph() { for (const_iterator I = begin(); I != end(); ++I) - { - SchedGraphNode *node = I->second; - - // for each node, delete its out-edges - std::for_each(node->beginOutEdges(), node->endOutEdges(), - deleter); - - // then delete the node itself. - delete node; - } + delete I->second; + delete graphRoot; + delete graphLeaf; } @@ -967,8 +963,8 @@ SchedGraphSet::SchedGraphSet(const Function* _function, SchedGraphSet::~SchedGraphSet() { // delete all the graphs - for (const_iterator I = begin(); I != end(); ++I) - delete *I; + for(iterator I = begin(), E = end(); I != E; ++I) + delete *I; // destructor is a friend } diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp index daf4a49bb83..28679bfbdc8 100644 --- a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp +++ b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp @@ -168,6 +168,9 @@ SchedGraphNode::SchedGraphNode(unsigned int _nodeId, /*dtor*/ SchedGraphNode::~SchedGraphNode() { + // for each node, delete its out-edges + std::for_each(beginOutEdges(), endOutEdges(), + deleter); } void SchedGraphNode::dump(int indent=0) const { @@ -233,16 +236,9 @@ SchedGraph::SchedGraph(const BasicBlock* bb, SchedGraph::~SchedGraph() { for (const_iterator I = begin(); I != end(); ++I) - { - SchedGraphNode *node = I->second; - - // for each node, delete its out-edges - std::for_each(node->beginOutEdges(), node->endOutEdges(), - deleter); - - // then delete the node itself. - delete node; - } + delete I->second; + delete graphRoot; + delete graphLeaf; } @@ -967,8 +963,8 @@ SchedGraphSet::SchedGraphSet(const Function* _function, SchedGraphSet::~SchedGraphSet() { // delete all the graphs - for (const_iterator I = begin(); I != end(); ++I) - delete *I; + for(iterator I = begin(), E = end(); I != E; ++I) + delete *I; // destructor is a friend } -- 2.34.1