From 0e233ae1831850085af79f08dba47b77769b124c Mon Sep 17 00:00:00 2001
From: Jakob Stoklund Olesen <stoklund@2pi.dk>
Date: Thu, 13 Jan 2011 18:41:05 +0000
Subject: [PATCH] Teach MachineBasicBlock::getFirstTerminator to ignore debug
 values.

It will still return an iterator that points to the first terminator or end(),
but there may be DBG_VALUE instructions following the first terminator.

llvm-svn: 123384
---
 llvm/lib/CodeGen/MachineBasicBlock.cpp | 21 ++++++++++++++++-----
 llvm/lib/CodeGen/PHIElimination.cpp    |  2 ++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/llvm/lib/CodeGen/MachineBasicBlock.cpp b/llvm/lib/CodeGen/MachineBasicBlock.cpp
index 813fad288e8f..b5904443a8b4 100644
--- a/llvm/lib/CodeGen/MachineBasicBlock.cpp
+++ b/llvm/lib/CodeGen/MachineBasicBlock.cpp
@@ -155,11 +155,22 @@ MachineBasicBlock::SkipPHIsAndLabels(MachineBasicBlock::iterator I) {
 }
 
 MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator() {
-  iterator I = end();
-  while (I != begin() && (--I)->getDesc().isTerminator())
-    ; /*noop */
-  if (I != end() && !I->getDesc().isTerminator()) ++I;
-  return I;
+  iterator B = begin(), I = end();
+  iterator Term = I;
+  while (I != B) {
+    --I;
+    // Ignore any debug values after the first terminator.
+    if (I->isDebugValue())
+      continue;
+    // Stop once we see a non-debug non-terminator.
+    if (!I->getDesc().isTerminator())
+      break;
+    // Earliest terminator so far.
+    Term = I;
+  }
+  // Return the first terminator, or end().
+  // Everything after Term is terminators and debug values.
+  return Term;
 }
 
 void MachineBasicBlock::dump() const {
diff --git a/llvm/lib/CodeGen/PHIElimination.cpp b/llvm/lib/CodeGen/PHIElimination.cpp
index 923fa213e7ba..81ae3618eeb5 100644
--- a/llvm/lib/CodeGen/PHIElimination.cpp
+++ b/llvm/lib/CodeGen/PHIElimination.cpp
@@ -339,6 +339,8 @@ void PHIElimination::LowerAtomicPHINode(
 #ifndef NDEBUG
         for (MachineBasicBlock::iterator TI = llvm::next(Term);
              TI != opBlock.end(); ++TI) {
+          if (TI->isDebugValue())
+            continue;
           assert(!TI->readsRegister(SrcReg) &&
                  "Terminator instructions cannot use virtual registers unless"
                  "they are the first terminator in a block!");