Moved MachineBasicBlock deconstructor to cpp file and removed it from LeakDetector to fix memory leak bug.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@13718 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Tanya Lattner 2004-05-24 07:14:35 +00:00
parent b11a99bd39
commit 17fb34bf8c
4 changed files with 17 additions and 10 deletions

View File

@ -71,7 +71,8 @@ public:
Number(-1), Parent(0) { Number(-1), Parent(0) {
Insts.parent = this; Insts.parent = this;
} }
~MachineBasicBlock() {}
~MachineBasicBlock();
/// getBasicBlock - Return the LLVM basic block that this instance /// getBasicBlock - Return the LLVM basic block that this instance
/// corresponded to originally. /// corresponded to originally.

View File

@ -28,10 +28,10 @@ template <>
class ilist_traits<MachineBasicBlock> { class ilist_traits<MachineBasicBlock> {
// this is only set by the MachineFunction owning the ilist // this is only set by the MachineFunction owning the ilist
friend class MachineFunction; friend class MachineFunction;
MachineFunction* parent; MachineFunction* Parent;
public: public:
ilist_traits<MachineBasicBlock>() : parent(0) { } ilist_traits<MachineBasicBlock>() : Parent(0) { }
static MachineBasicBlock* getPrev(MachineBasicBlock* N) { return N->Prev; } static MachineBasicBlock* getPrev(MachineBasicBlock* N) { return N->Prev; }
static MachineBasicBlock* getNext(MachineBasicBlock* N) { return N->Next; } static MachineBasicBlock* getNext(MachineBasicBlock* N) { return N->Next; }
@ -68,7 +68,7 @@ class MachineFunction : private Annotation {
const TargetMachine &Target; const TargetMachine &Target;
// List of machine basic blocks in function // List of machine basic blocks in function
iplist<MachineBasicBlock> BasicBlocks; ilist<MachineBasicBlock> BasicBlocks;
// Keeping track of mapping from SSA values to registers // Keeping track of mapping from SSA values to registers
SSARegMap *SSARegMapping; SSARegMap *SSARegMapping;
@ -145,7 +145,7 @@ public:
static MachineFunction& get(const Function *F); static MachineFunction& get(const Function *F);
// Provide accessors for the MachineBasicBlock list... // Provide accessors for the MachineBasicBlock list...
typedef iplist<MachineBasicBlock> BasicBlockListType; typedef ilist<MachineBasicBlock> BasicBlockListType;
typedef BasicBlockListType::iterator iterator; typedef BasicBlockListType::iterator iterator;
typedef BasicBlockListType::const_iterator const_iterator; typedef BasicBlockListType::const_iterator const_iterator;
typedef std::reverse_iterator<const_iterator> const_reverse_iterator; typedef std::reverse_iterator<const_iterator> const_reverse_iterator;

View File

@ -20,14 +20,20 @@
#include "Support/LeakDetector.h" #include "Support/LeakDetector.h"
using namespace llvm; using namespace llvm;
MachineBasicBlock::~MachineBasicBlock() {
LeakDetector::removeGarbageObject(this);
}
// MBBs start out as #-1. When a MBB is added to a MachineFunction, it // MBBs start out as #-1. When a MBB is added to a MachineFunction, it
// gets the next available unique MBB number. If it is removed from a // gets the next available unique MBB number. If it is removed from a
// MachineFunction, it goes back to being #-1. // MachineFunction, it goes back to being #-1.
void ilist_traits<MachineBasicBlock>::addNodeToList (MachineBasicBlock* N) void ilist_traits<MachineBasicBlock>::addNodeToList (MachineBasicBlock* N)
{ {
assert(N->Parent == 0 && "machine instruction already in a basic block"); assert(N->Parent == 0 && "machine instruction already in a basic block");
N->Parent = parent; N->Parent = Parent;
N->Number = parent->getNextMBBNumber(); N->Number = Parent->getNextMBBNumber();
LeakDetector::removeGarbageObject(N); LeakDetector::removeGarbageObject(N);

View File

@ -98,9 +98,9 @@ void ilist_traits<MachineBasicBlock>::transferNodesFromList(
ilist_iterator<MachineBasicBlock> first, ilist_iterator<MachineBasicBlock> first,
ilist_iterator<MachineBasicBlock> last) ilist_iterator<MachineBasicBlock> last)
{ {
if (parent != toList.parent) if (Parent != toList.Parent)
for (; first != last; ++first) for (; first != last; ++first)
first->Parent = toList.parent; first->Parent = toList.Parent;
} }
MachineFunction::MachineFunction(const Function *F, MachineFunction::MachineFunction(const Function *F,
@ -110,7 +110,7 @@ MachineFunction::MachineFunction(const Function *F,
MFInfo = new MachineFunctionInfo(*this); MFInfo = new MachineFunctionInfo(*this);
FrameInfo = new MachineFrameInfo(); FrameInfo = new MachineFrameInfo();
ConstantPool = new MachineConstantPool(); ConstantPool = new MachineConstantPool();
BasicBlocks.parent = this; BasicBlocks.Parent = this;
} }
MachineFunction::~MachineFunction() { MachineFunction::~MachineFunction() {