From: Jonas Paulsson <jonas.paulsson@ericsson.com>
Date: Thu, 8 Oct 2015 07:39:55 +0000 (+0000)
Subject: [SystemZ] Minor fixes in SystemZElimCompare.cpp
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=41c6cf387c9d5ac2685c28f9e708b87d7b066a8e;p=oota-llvm.git

[SystemZ] Minor fixes in SystemZElimCompare.cpp

Reviewed by Ulrich Weigand.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@249662 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/SystemZ/SystemZElimCompare.cpp b/lib/Target/SystemZ/SystemZElimCompare.cpp
index 16f9adc79f1..d26e40b4791 100644
--- a/lib/Target/SystemZ/SystemZElimCompare.cpp
+++ b/lib/Target/SystemZ/SystemZElimCompare.cpp
@@ -205,7 +205,7 @@ SystemZElimCompare::convertToBRCT(MachineInstr *MI, MachineInstr *Compare,
     .addOperand(MI->getOperand(1))
     .addOperand(Target)
     .addReg(SystemZ::CC, RegState::ImplicitDefine);
-  MI->removeFromParent();
+  MI->eraseFromParent();
   return true;
 }
 
@@ -439,17 +439,16 @@ bool SystemZElimCompare::processBlock(MachineBasicBlock &MBB) {
         (optimizeCompareZero(MI, CCUsers) ||
          fuseCompareAndBranch(MI, CCUsers))) {
       ++MBBI;
-      MI->removeFromParent();
+      MI->eraseFromParent();
       Changed = true;
       CCUsers.clear();
-      CompleteCCUsers = true;
       continue;
     }
 
     Reference CCRefs(getRegReferences(MI, SystemZ::CC));
     if (CCRefs.Def) {
       CCUsers.clear();
-      CompleteCCUsers = !CCRefs.IndirectDef;
+      CompleteCCUsers = true;
     }
     if (CompleteCCUsers && CCRefs.Use)
       CCUsers.push_back(MI);