Avoid setIsInsideBundle in Target/R600.

This function is going to be removed.

llvm-svn: 170064

2 files changed, 11 insertions, 10 deletions

diff --git a/llvm/lib/Target/R600/R600ExpandSpecialInstrs.cpp b/llvm/lib/Target/R600/R600ExpandSpecialInstrs.cpp
index 58221f9ec2b..b6e62b7cef5 100644
--- a/llvm/lib/Target/R600/R600ExpandSpecialInstrs.cpp
+++ b/llvm/lib/Target/R600/R600ExpandSpecialInstrs.cpp
@@ -318,7 +318,8 @@ bool R600ExpandSpecialInstrsPass::runOnMachineFunction(MachineFunction &MF) {
         MachineInstr *NewMI =
           TII->buildDefaultInstruction(MBB, I, Opcode, DstReg, Src0, Src1);
 
-        NewMI->setIsInsideBundle(Chan != 0);
+        if (Chan != 0)
+          NewMI->bundleWithPred();
         if (Mask) {
           TII->addFlag(NewMI, 0, MO_FLAG_MASK);
         }
diff --git a/llvm/lib/Target/R600/SILowerLiteralConstants.cpp b/llvm/lib/Target/R600/SILowerLiteralConstants.cpp
index 2d5ab0bea1a..c0411e9b4d5 100644
--- a/llvm/lib/Target/R600/SILowerLiteralConstants.cpp
+++ b/llvm/lib/Target/R600/SILowerLiteralConstants.cpp
@@ -89,15 +89,15 @@ bool SILowerLiteralConstantsPass::runOnMachineFunction(MachineFunction &MF) {
           } else {
             LoadLiteralOpcode = AMDGPU::SI_LOAD_LITERAL_F32;
           }
-          MachineInstr *First =
-            BuildMI(MBB, I, MBB.findDebugLoc(I), TII->get(MovOpcode),
-                    MI.getOperand(0).getReg())
-                    .addReg(AMDGPU::SI_LITERAL_CONSTANT);
-          MachineInstr *Last =
-            BuildMI(MBB, I, MBB.findDebugLoc(I), TII->get(LoadLiteralOpcode))
-                    .addOperand(MI.getOperand(1));
-          Last->setIsInsideBundle();
-          llvm::finalizeBundle(MBB, First, Last);
+          MIBundleBuilder Bundle(MBB, I);
+          Bundle
+            .append(BuildMI(MF, MBB.findDebugLoc(I), TII->get(MovOpcode),
+                            MI.getOperand(0).getReg())
+                    .addReg(AMDGPU::SI_LITERAL_CONSTANT))
+            .append(BuildMI(MF, MBB.findDebugLoc(I),
+                            TII->get(LoadLiteralOpcode))
+                    .addOperand(MI.getOperand(1)));
+          llvm::finalizeBundle(MBB, Bundle.begin());
           MI.eraseFromParent();
           break;
         }