[llvm-commits] [llvm] r123384 - in /llvm/trunk/lib/CodeGen: MachineBasicBlock.cpp PHIElimination.cpp

[Jakob Stoklund Olesen]

Author: stoklund
Date: Thu Jan 13 12:41:05 2011
New Revision: 123384

URL: http://llvm.org/viewvc/llvm-project?rev=123384&view=rev
Log:
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.

Modified:
    llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp
    llvm/trunk/lib/CodeGen/PHIElimination.cpp

Modified: llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp?rev=123384&r1=123383&r2=123384&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp Thu Jan 13 12:41:05 2011
@@ -155,11 +155,22 @@
 }
 
 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 {

Modified: llvm/trunk/lib/CodeGen/PHIElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PHIElimination.cpp?rev=123384&r1=123383&r2=123384&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/PHIElimination.cpp (original)
+++ llvm/trunk/lib/CodeGen/PHIElimination.cpp Thu Jan 13 12:41:05 2011
@@ -339,6 +339,8 @@
 #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!");