From: John Criswell Date: Thu, 28 Aug 2003 21:43:17 +0000 (+0000) Subject: Fixed two double free bugs that caused llc to segfault or run forever. X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c9afb499f67a92c70ce349e84081f5bb41fab591;p=oota-llvm.git Fixed two double free bugs that caused llc to segfault or run forever. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8191 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/InstrSched/SchedGraph.cpp b/lib/CodeGen/InstrSched/SchedGraph.cpp index 9de04343648..bcdd1cfcfce 100644 --- a/lib/CodeGen/InstrSched/SchedGraph.cpp +++ b/lib/CodeGen/InstrSched/SchedGraph.cpp @@ -53,10 +53,18 @@ SchedGraphNode::SchedGraphNode(unsigned NID, MachineBasicBlock *mbb, } } +// +// Method: SchedGraphNode Destructor +// +// Description: +// Free memory allocated by the SchedGraphNode object. +// +// Notes: +// Do not delete the edges here. The base class will take care of that. +// Only handle subclass specific stuff here (where currently there is +// none). +// SchedGraphNode::~SchedGraphNode() { - // for each node, delete its out-edges - std::for_each(beginOutEdges(), endOutEdges(), - deleter); } // @@ -67,11 +75,19 @@ SchedGraph::SchedGraph(MachineBasicBlock &mbb, const TargetMachine& target) buildGraph(target); } +// +// Method: SchedGraph Destructor +// +// Description: +// This method deletes memory allocated by the SchedGraph object. +// +// Notes: +// Do not delete the graphRoot or graphLeaf here. The base class handles +// that bit of work. +// SchedGraph::~SchedGraph() { for (const_iterator I = begin(); I != end(); ++I) delete I->second; - delete graphRoot; - delete graphLeaf; } void SchedGraph::dump() const { diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp index 9de04343648..bcdd1cfcfce 100644 --- a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp +++ b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp @@ -53,10 +53,18 @@ SchedGraphNode::SchedGraphNode(unsigned NID, MachineBasicBlock *mbb, } } +// +// Method: SchedGraphNode Destructor +// +// Description: +// Free memory allocated by the SchedGraphNode object. +// +// Notes: +// Do not delete the edges here. The base class will take care of that. +// Only handle subclass specific stuff here (where currently there is +// none). +// SchedGraphNode::~SchedGraphNode() { - // for each node, delete its out-edges - std::for_each(beginOutEdges(), endOutEdges(), - deleter); } // @@ -67,11 +75,19 @@ SchedGraph::SchedGraph(MachineBasicBlock &mbb, const TargetMachine& target) buildGraph(target); } +// +// Method: SchedGraph Destructor +// +// Description: +// This method deletes memory allocated by the SchedGraph object. +// +// Notes: +// Do not delete the graphRoot or graphLeaf here. The base class handles +// that bit of work. +// SchedGraph::~SchedGraph() { for (const_iterator I = begin(); I != end(); ++I) delete I->second; - delete graphRoot; - delete graphLeaf; } void SchedGraph::dump() const {