Revert r365198 as this accidentally commited something that

should not have been added.

llvm-svn: 365199

1 files changed, 2 insertions, 7 deletions

diff --git a/llvm/lib/CodeGen/MachineBasicBlock.cpp b/llvm/lib/CodeGen/MachineBasicBlock.cpp
index 6f69a0f0bd3..c3e9c185be9 100644
--- a/llvm/lib/CodeGen/MachineBasicBlock.cpp
+++ b/llvm/lib/CodeGen/MachineBasicBlock.cpp
@@ -1384,7 +1384,7 @@ MachineBasicBlock::computeRegisterLiveness(const TargetRegisterInfo *TRI,
   // Try searching forwards from Before, looking for reads or defs.
   const_iterator I(Before);
   for (; I != end() && N > 0; ++I) {
-    if (I->isMetaInstruction())
+    if (I->isDebugInstr())
       continue;
 
     --N;
@@ -1423,7 +1423,7 @@ MachineBasicBlock::computeRegisterLiveness(const TargetRegisterInfo *TRI,
     do {
       --I;
 
-      if (I->isMetaInstruction())
+      if (I->isDebugInstr())
         continue;
 
       --N;
@@ -1456,11 +1456,6 @@ MachineBasicBlock::computeRegisterLiveness(const TargetRegisterInfo *TRI,
     } while (I != begin() && N > 0);
   }
 
-  // Check for the edge condition where the only instructions between I and
-  // begin() are meta instructions.
-  if (I != begin() && std::prev(I)->isMetaInstruction()) 
-    I = skipMetaInstructionsBackward(std::prev(I), begin());
-
   // Did we get to the start of the block?
   if (I == begin()) {
     // If so, the register's state is definitely defined by the live-in state.