From ea670f1dd8067a9b65f952d0548669045bf0e21f Mon Sep 17 00:00:00 2001
From: David Goodwin <david_goodwin@apple.com>
Date: Mon, 13 Jul 2009 21:43:08 +0000
Subject: [PATCH] Fix FP elimination code to work for Thumb-2 addrmode
 AddrModeT2_so. This fixes SingleSource/Benchmarks/Stanford/Queens (among
 others).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75513 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Target/ARM/ARMBaseRegisterInfo.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/Target/ARM/ARMBaseRegisterInfo.cpp b/lib/Target/ARM/ARMBaseRegisterInfo.cpp
index c93473d62e6..41b061a1237 100644
--- a/lib/Target/ARM/ARMBaseRegisterInfo.cpp
+++ b/lib/Target/ARM/ARMBaseRegisterInfo.cpp
@@ -1121,18 +1121,22 @@ eliminateFrameIndex(MachineBasicBlock::iterator II,
       break;
     }
     case ARMII::AddrModeT2_i12: {
-      ImmIdx = i+2;
+      ImmIdx = i+1;
       InstrOffs = MI.getOperand(ImmIdx).getImm();
       NumBits = 12;
       break;
     }
-    case ARMII::AddrModeT2_so:
     case ARMII::AddrModeT2_i8: {
-      ImmIdx = i+2;
+      ImmIdx = i+1;
       InstrOffs = MI.getOperand(ImmIdx).getImm();
       NumBits = 8;
       break;
     }
+    case ARMII::AddrModeT2_so: {
+      ImmIdx = i+2;
+      InstrOffs = MI.getOperand(ImmIdx).getImm();
+      break;
+    }
     default:
       LLVM_UNREACHABLE("Unsupported addressing mode!");
       break;