Mesa (master): radeon/llvm: Delete all instructions that have been custom lowered

[Tom Stellard]

Module: Mesa
Branch: master
Commit: fa3747ff2ce929ceda499fde93927354685f20ef
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fa3747ff2ce929ceda499fde93927354685f20ef

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Thu May 10 11:31:52 2012 -0400

radeon/llvm: Delete all instructions that have been custom lowered

---

 src/gallium/drivers/radeon/R600ISelLowering.cpp |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/radeon/R600ISelLowering.cpp b/src/gallium/drivers/radeon/R600ISelLowering.cpp
index 52e2bd8..cfea2c3 100644
--- a/src/gallium/drivers/radeon/R600ISelLowering.cpp
+++ b/src/gallium/drivers/radeon/R600ISelLowering.cpp
@@ -98,7 +98,6 @@ MachineBasicBlock * R600TargetLowering::EmitInstrWithCustomInserter(
       BuildMI(*BB, I, BB->findDebugLoc(I), TII->get(AMDIL::COPY))
                   .addOperand(MI->getOperand(0))
                   .addReg(ConstantReg);
-      MI->eraseFromParent();
       break;
     }
 
@@ -107,7 +106,6 @@ MachineBasicBlock * R600TargetLowering::EmitInstrWithCustomInserter(
       int64_t RegIndex = MI->getOperand(1).getImm();
       addLiveIn(MI, MF, MRI, TII,
                 AMDIL::R600_TReg32RegClass.getRegister(RegIndex));
-      MI->eraseFromParent();
       break;
     }
   case AMDIL::STORE_OUTPUT:
@@ -121,7 +119,6 @@ MachineBasicBlock * R600TargetLowering::EmitInstrWithCustomInserter(
       if (!MRI.isLiveOut(OutputReg)) {
         MRI.addLiveOut(OutputReg);
       }
-      MI->eraseFromParent();
       break;
     }
 
@@ -132,11 +129,11 @@ MachineBasicBlock * R600TargetLowering::EmitInstrWithCustomInserter(
       unsigned ReservedReg =
                           AMDIL::R600_TReg32RegClass.getRegister(ReservedIndex);
       MFI->ReservedRegs.push_back(ReservedReg);
-      MI->eraseFromParent();
       break;
     }
   }
 
+  MI->eraseFromParent();
   return BB;
 }