[MCTargetAsmParser] Move the member varialbes that reference

[oota-llvm.git] / lib / Target / AMDGPU / AMDGPUInstrInfo.cpp

diff --git a/lib/Target/AMDGPU/AMDGPUInstrInfo.cpp b/lib/Target/AMDGPU/AMDGPUInstrInfo.cpp
index 85e0ac5a07c05d9a7ab78cf8126956d732da48d7..a266e711af5b4d9382f42563c864099617e7cf2e 100644 (file)
--- a/lib/Target/AMDGPU/AMDGPUInstrInfo.cpp
+++ b/lib/Target/AMDGPU/AMDGPUInstrInfo.cpp
@@ -307,7 +307,9 @@ int AMDGPUInstrInfo::getIndirectIndexEnd(const MachineFunction &MF) const {
     return -1;
   }
 
-  Offset = MF.getSubtarget().getFrameLowering()->getFrameIndexOffset(MF, -1);
+  unsigned IgnoredFrameReg;
+  Offset = MF.getSubtarget().getFrameLowering()->getFrameIndexReference(
+      MF, -1, IgnoredFrameReg);
 
   return getIndirectIndexBegin(MF) + Offset;
 }
@@ -365,7 +367,7 @@ int AMDGPUInstrInfo::pseudoToMCOpcode(int Opcode) const {
 
 ArrayRef<std::pair<int, const char *>>
 AMDGPUInstrInfo::getSerializableTargetIndices() const {
-  static std::pair<int, const char *> TargetIndices[] = {
+  static const std::pair<int, const char *> TargetIndices[] = {
       {AMDGPU::TI_CONSTDATA_START, "amdgpu-constdata-start"},
       {AMDGPU::TI_SCRATCH_RSRC_DWORD0, "amdgpu-scratch-rsrc-dword0"},
       {AMDGPU::TI_SCRATCH_RSRC_DWORD1, "amdgpu-scratch-rsrc-dword1"},