[llvm-commits] CVS: llvm/lib/CodeGen/MachineBasicBlock.cpp

[Chris Lattner]

Changes in directory llvm/lib/CodeGen:

MachineBasicBlock.cpp updated: 1.20 -> 1.21
---
Log message:

Move method bodies that depend on <algorithm> from MBB.h to MBB.cpp


---
Diffs of the changes:  (+38 -14)

Index: llvm/lib/CodeGen/MachineBasicBlock.cpp
diff -u llvm/lib/CodeGen/MachineBasicBlock.cpp:1.20 llvm/lib/CodeGen/MachineBasicBlock.cpp:1.21
--- llvm/lib/CodeGen/MachineBasicBlock.cpp:1.20	Sun Sep  5 13:39:20 2004
+++ llvm/lib/CodeGen/MachineBasicBlock.cpp	Tue Oct 26 10:43:42 2004
@@ -19,6 +19,7 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/LeakDetector.h"
 #include <iostream>
+#include <algorithm>
 using namespace llvm;
 
 MachineBasicBlock::~MachineBasicBlock() {
@@ -26,7 +27,6 @@
 }
 
 
-
 // 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.
@@ -52,15 +52,13 @@
   return dummy;
 }
 
-void ilist_traits<MachineInstr>::addNodeToList(MachineInstr* N)
-{
+void ilist_traits<MachineInstr>::addNodeToList(MachineInstr* N) {
   assert(N->parent == 0 && "machine instruction already in a basic block");
   N->parent = parent;
   LeakDetector::removeGarbageObject(N);
 }
 
-void ilist_traits<MachineInstr>::removeNodeFromList(MachineInstr* N)
-{
+void ilist_traits<MachineInstr>::removeNodeFromList(MachineInstr* N) {
   assert(N->parent != 0 && "machine instruction not in a basic block");
   N->parent = 0;
   LeakDetector::addGarbageObject(N);
@@ -69,15 +67,13 @@
 void ilist_traits<MachineInstr>::transferNodesFromList(
   iplist<MachineInstr, ilist_traits<MachineInstr> >& toList,
   ilist_iterator<MachineInstr> first,
-  ilist_iterator<MachineInstr> last)
-{
+  ilist_iterator<MachineInstr> last) {
   if (parent != toList.parent)
     for (; first != last; ++first)
       first->parent = toList.parent;
 }
 
-MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator()
-{
+MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator() {
   const TargetInstrInfo& TII = *getParent()->getTarget().getInstrInfo();
   iterator I = end();
   while (I != begin() && TII.isTerminatorInstr((--I)->getOpcode()));
@@ -85,15 +81,14 @@
   return I;
 }
 
-void MachineBasicBlock::dump() const
-{
+void MachineBasicBlock::dump() const {
   print(std::cerr);
 }
 
-void MachineBasicBlock::print(std::ostream &OS) const
-{
+void MachineBasicBlock::print(std::ostream &OS) const {
   if(!getParent()) {
-    OS << "Can't print out MachineBasicBlock because parent MachineFunction is null\n";
+    OS << "Can't print out MachineBasicBlock because parent MachineFunction"
+       << " is null\n";
     return;
   }
 
@@ -106,3 +101,32 @@
     I->print(OS, &getParent()->getTarget());
   }
 }
+
+void MachineBasicBlock::addSuccessor(MachineBasicBlock *succ) {
+  Successors.push_back(succ);
+  succ->addPredecessor(this);
+}
+
+void MachineBasicBlock::removeSuccessor(MachineBasicBlock *succ) {
+  succ->removePredecessor(this);
+  succ_iterator I = std::find(Successors.begin(), Successors.end(), succ);
+  assert(I != Successors.end() && "Not a current successor!");
+  Successors.erase(I);
+}
+
+void MachineBasicBlock::removeSuccessor(succ_iterator I) {
+  assert(I != Successors.end() && "Not a current successor!");
+  (*I)->removePredecessor(this);
+  Successors.erase(I);
+}
+
+void MachineBasicBlock::addPredecessor(MachineBasicBlock *pred) {
+  Predecessors.push_back(pred);
+}
+
+void MachineBasicBlock::removePredecessor(MachineBasicBlock *pred) {
+  std::vector<MachineBasicBlock *>::iterator I = 
+    std::find(Predecessors.begin(), Predecessors.end(), pred);
+  assert(I != Predecessors.end() && "Pred is not a predecessor of this block!");
+  Predecessors.erase(I);
+}