1 files changed, 11 insertions, 9 deletions
diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp
index 030438fceb..9215bd583b 100644
--- a/lib/CodeGen/MachineBasicBlock.cpp
+++ b/lib/CodeGen/MachineBasicBlock.cpp
@@ -524,24 +524,26 @@ bool MachineBasicBlock::CorrectExtraCFGEdges(MachineBasicBlock *DestA,
   return MadeChange;
 }
 
-void llvm::WriteAsOperand(raw_ostream &OS, const MachineBasicBlock *MBB,
-                          bool t) {
-  OS << "BB#" << MBB->getNumber();
-}
-
 /// findDebugLoc - find the next valid DebugLoc starting at MBBI, skipping
 /// any DEBUG_VALUE instructions.  Return UnknownLoc if there is none.
 DebugLoc
-llvm::findDebugLoc(MachineBasicBlock::iterator &MBBI, MachineBasicBlock &MBB) {
+MachineBasicBlock::findDebugLoc(MachineBasicBlock::iterator &MBBI) {
   DebugLoc DL;
-  if (MBBI != MBB.end()) {
+  MachineBasicBlock::iterator E = end();
+  if (MBBI != E) {
     // Skip debug declarations, we don't want a DebugLoc from them.
     MachineBasicBlock::iterator MBBI2 = MBBI;
-    while (MBBI2 != MBB.end() &&
+    while (MBBI2 != E &&
            MBBI2->getOpcode()==TargetInstrInfo::DEBUG_VALUE)
       MBBI2++;
-    if (MBBI2 != MBB.end())
+    if (MBBI2 != E)
       DL = MBBI2->getDebugLoc();
   }
   return DL;
 }
+
+void llvm::WriteAsOperand(raw_ostream &OS, const MachineBasicBlock *MBB,
+                          bool t) {
+  OS << "BB#" << MBB->getNumber();
+}
+