[llvm] r276775 - GlobalISel: add correct operand type to G_FRAME_INDEX instrs.

[Tim Northover via llvm-commits]

Author: tnorthover
Date: Tue Jul 26 12:42:40 2016
New Revision: 276775

URL: http://llvm.org/viewvc/llvm-project?rev=276775&view=rev
Log:
GlobalISel: add correct operand type to G_FRAME_INDEX instrs.

Frame indices should use "addFrameIndex", not "addImm".

Modified:
    llvm/trunk/lib/CodeGen/GlobalISel/MachineIRBuilder.cpp
    llvm/trunk/test/CodeGen/AArch64/GlobalISel/arm64-irtranslator.ll

Modified: llvm/trunk/lib/CodeGen/GlobalISel/MachineIRBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/GlobalISel/MachineIRBuilder.cpp?rev=276775&r1=276774&r2=276775&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/GlobalISel/MachineIRBuilder.cpp (original)
+++ llvm/trunk/lib/CodeGen/GlobalISel/MachineIRBuilder.cpp Tue Jul 26 12:42:40 2016
@@ -75,7 +75,7 @@ MachineInstr *MachineIRBuilder::buildFra
   MachineInstr *NewMI = buildInstr(TargetOpcode::G_FRAME_INDEX, Ty);
   auto MIB = MachineInstrBuilder(getMF(), NewMI);
   MIB.addReg(Res, RegState::Define);
-  MIB.addImm(Idx);
+  MIB.addFrameIndex(Idx);
   return NewMI;
 }
 

Modified: llvm/trunk/test/CodeGen/AArch64/GlobalISel/arm64-irtranslator.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/GlobalISel/arm64-irtranslator.ll?rev=276775&r1=276774&r2=276775&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AArch64/GlobalISel/arm64-irtranslator.ll (original)
+++ llvm/trunk/test/CodeGen/AArch64/GlobalISel/arm64-irtranslator.ll Tue Jul 26 12:42:40 2016
@@ -23,9 +23,9 @@ define i64 @addi64(i64 %arg1, i64 %arg2)
 ; CHECK-NEXT:   - { id: 0, name: ptr1, offset: 0, size: 8, alignment: 8 }
 ; CHECK-NEXT:   - { id: 1, name: ptr2, offset: 0, size: 8, alignment: 1 }
 ; CHECK-NEXT:   - { id: 2, name: ptr3, offset: 0, size: 128, alignment: 8 }
-; CHECK: %{{[0-9]+}}(64) = G_FRAME_INDEX p0 0
-; CHECK: %{{[0-9]+}}(64) = G_FRAME_INDEX p0 1
-; CHECK: %{{[0-9]+}}(64) = G_FRAME_INDEX p0 2
+; CHECK: %{{[0-9]+}}(64) = G_FRAME_INDEX p0 %stack.0.ptr1
+; CHECK: %{{[0-9]+}}(64) = G_FRAME_INDEX p0 %stack.1.ptr2
+; CHECK: %{{[0-9]+}}(64) = G_FRAME_INDEX p0 %stack.2.ptr3
 define void @allocai64() {
   %ptr1 = alloca i64
   %ptr2 = alloca i64, align 1