4 files changed, 17 insertions, 10 deletions
diff --git a/include/llvm/CodeGen/MachineBasicBlock.h b/include/llvm/CodeGen/MachineBasicBlock.h
index 4dfda90ae8..3dee00da31 100644
--- a/include/llvm/CodeGen/MachineBasicBlock.h
+++ b/include/llvm/CodeGen/MachineBasicBlock.h
@@ -71,7 +71,8 @@ public:
                                                 Number(-1), Parent(0) {
     Insts.parent = this;
   }
-  ~MachineBasicBlock() {}
+
+  ~MachineBasicBlock();
   
   /// getBasicBlock - Return the LLVM basic block that this instance
   /// corresponded to originally.
diff --git a/include/llvm/CodeGen/MachineFunction.h b/include/llvm/CodeGen/MachineFunction.h
index dcec822f8e..e1c19865fa 100644
--- a/include/llvm/CodeGen/MachineFunction.h
+++ b/include/llvm/CodeGen/MachineFunction.h
@@ -28,10 +28,10 @@ template <>
 class ilist_traits<MachineBasicBlock> {
   // this is only set by the MachineFunction owning the ilist
   friend class MachineFunction;
-  MachineFunction* parent;
+  MachineFunction* Parent;
   
 public:
-  ilist_traits<MachineBasicBlock>() : parent(0) { }
+  ilist_traits<MachineBasicBlock>() : Parent(0) { }
   
   static MachineBasicBlock* getPrev(MachineBasicBlock* N) { return N->Prev; }
   static MachineBasicBlock* getNext(MachineBasicBlock* N) { return N->Next; }
@@ -68,7 +68,7 @@ class MachineFunction : private Annotation {
   const TargetMachine &Target;
 
   // List of machine basic blocks in function
-  iplist<MachineBasicBlock> BasicBlocks;
+  ilist<MachineBasicBlock> BasicBlocks;
 
   // Keeping track of mapping from SSA values to registers
   SSARegMap *SSARegMapping;
@@ -145,7 +145,7 @@ public:
   static MachineFunction& get(const Function *F);
 
   // Provide accessors for the MachineBasicBlock list...
-  typedef iplist<MachineBasicBlock> BasicBlockListType;
+  typedef ilist<MachineBasicBlock> BasicBlockListType;
   typedef BasicBlockListType::iterator iterator;
   typedef BasicBlockListType::const_iterator const_iterator;
   typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp
index c0b144d26c..c72b247d8a 100644
--- a/lib/CodeGen/MachineBasicBlock.cpp
+++ b/lib/CodeGen/MachineBasicBlock.cpp
@@ -20,14 +20,20 @@
 #include "Support/LeakDetector.h"
 using namespace llvm;
 
+MachineBasicBlock::~MachineBasicBlock() {
+  LeakDetector::removeGarbageObject(this);
+}
+  
+
+
 // 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
 // MachineFunction, it goes back to being #-1.
 void ilist_traits<MachineBasicBlock>::addNodeToList (MachineBasicBlock* N)
 {
   assert(N->Parent == 0 && "machine instruction already in a basic block");
-  N->Parent = parent;
-  N->Number = parent->getNextMBBNumber();
+  N->Parent = Parent;
+  N->Number = Parent->getNextMBBNumber();
   LeakDetector::removeGarbageObject(N);
   
 
diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp
index a3e9211f5c..54149c3281 100644
--- a/lib/CodeGen/MachineFunction.cpp
+++ b/lib/CodeGen/MachineFunction.cpp
@@ -98,9 +98,9 @@ void ilist_traits<MachineBasicBlock>::transferNodesFromList(
     ilist_iterator<MachineBasicBlock> first,
     ilist_iterator<MachineBasicBlock> last)
 {
-    if (parent != toList.parent)
+    if (Parent != toList.Parent)
         for (; first != last; ++first)
-            first->Parent = toList.parent;
+            first->Parent = toList.Parent;
 }
 
 MachineFunction::MachineFunction(const Function *F,
@@ -110,7 +110,7 @@ MachineFunction::MachineFunction(const Function *F,
   MFInfo = new MachineFunctionInfo(*this);
   FrameInfo = new MachineFrameInfo();
   ConstantPool = new MachineConstantPool();
-  BasicBlocks.parent = this;
+  BasicBlocks.Parent = this;
 }
 
 MachineFunction::~MachineFunction() {