Fix the sense of joinable

[oota-llvm.git] / lib / CodeGen / MachineBasicBlock.cpp

diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp
index 64f735c48e63bd6d685e2d31dbffea775c1208dc..20390a2f50e34d83ed7e98a9e654f4e50350d68c 100644 (file)
--- a/lib/CodeGen/MachineBasicBlock.cpp
+++ b/lib/CodeGen/MachineBasicBlock.cpp
@@ -18,36 +18,35 @@
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "Support/LeakDetector.h"
+#include <iostream>
 using namespace llvm;
 
-const MachineFunction *MachineBasicBlock::getParent() const {
-  // Get the parent by getting the Function parent of the basic block, and
-  // getting the MachineFunction from it.
-  return &MachineFunction::get(getBasicBlock()->getParent());
+MachineBasicBlock::~MachineBasicBlock() {
+  LeakDetector::removeGarbageObject(this);
 }
+  
 
-MachineFunction *MachineBasicBlock::getParent() {
-  // Get the parent by getting the Function parent of the basic block, and
-  // getting the MachineFunction from it.
-  return &MachineFunction::get(getBasicBlock()->getParent());
-}
 
 // 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)
-{
-  N->Number = N->getParent ()->getNextMBBNumber ();
+void ilist_traits<MachineBasicBlock>::addNodeToList(MachineBasicBlock* N) {
+  assert(N->Parent == 0 && "machine instruction already in a basic block");
+  N->Parent = Parent;
+  N->Number = Parent->addToMBBNumbering(N);
+  LeakDetector::removeGarbageObject(N);
 }
 
-void ilist_traits<MachineBasicBlock>::removeNodeFromList (MachineBasicBlock* N)
-{
+void ilist_traits<MachineBasicBlock>::removeNodeFromList(MachineBasicBlock* N) {
+  assert(N->Parent != 0 && "machine instruction not in a basic block");
+  N->Parent->removeFromMBBNumbering(N->Number);
   N->Number = -1;
+  N->Parent = 0;
+  LeakDetector::addGarbageObject(N);
 }
 
 
-MachineInstr* ilist_traits<MachineInstr>::createNode()
-{
+MachineInstr* ilist_traits<MachineInstr>::createNode() {
     MachineInstr* dummy = new MachineInstr(0, 0);
     LeakDetector::removeGarbageObject(dummy);
     return dummy;
@@ -79,7 +78,7 @@ void ilist_traits<MachineInstr>::transferNodesFromList(
 
 MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator()
 {
-  const TargetInstrInfo& TII = getParent()->getTarget().getInstrInfo();
+  const TargetInstrInfo& TII = *getParent()->getTarget().getInstrInfo();
   iterator I = end();
   while (I != begin() && TII.isTerminatorInstr((--I)->getOpcode()));
   if (I != end() && !TII.isTerminatorInstr(I->getOpcode())) ++I;
@@ -93,10 +92,16 @@ void MachineBasicBlock::dump() const
 
 void MachineBasicBlock::print(std::ostream &OS) const
 {
+  if(!getParent()) {
+    OS << "Can't print out MachineBasicBlock because parent MachineFunction is null\n";
+    return;
+  }
     const BasicBlock *LBB = getBasicBlock();
-    OS << "\n" << LBB->getName() << " (" << (const void*)LBB << "):\n";
+    if(LBB)
+      OS << "\n" << LBB->getName() << " (" << (const void*)this
+         << ", LLVM BB @" << (const void*) LBB << "):\n";
     for (const_iterator I = begin(); I != end(); ++I) {
         OS << "\t";
-        I->print(OS, getParent()->getTarget());
+        I->print(OS, &getParent()->getTarget());
     }
 }