From: Jim Grosbach <grosbach@apple.com>
Date: Wed, 25 Aug 2010 19:11:34 +0000 (+0000)
Subject: Don't override the var from the enclosing scope.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=f78ee6316bc755779920ac207edc27a89c0bd2f9;p=oota-llvm.git

Don't override the var from the enclosing scope.

When doing copy/paste/modify, it's apparently rather important to remember
the 'modify' bit...

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@112075 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/ARM/ARMBaseRegisterInfo.cpp b/lib/Target/ARM/ARMBaseRegisterInfo.cpp
index 850f9b4d601..bceaceb0805 100644
--- a/lib/Target/ARM/ARMBaseRegisterInfo.cpp
+++ b/lib/Target/ARM/ARMBaseRegisterInfo.cpp
@@ -1397,7 +1397,7 @@ getFrameIndexInstrOffset(MachineInstr *MI, int Idx) const {
   case ARMII::AddrMode5: {
     // VFP address mode.
     const MachineOperand &OffOp = MI->getOperand(Idx+1);
-    int InstrOffs = ARM_AM::getAM5Offset(OffOp.getImm());
+    InstrOffs = ARM_AM::getAM5Offset(OffOp.getImm());
     if (ARM_AM::getAM5Op(OffOp.getImm()) == ARM_AM::sub)
       InstrOffs = -InstrOffs;
     Scale = 4;
@@ -1593,7 +1593,7 @@ bool ARMBaseRegisterInfo::isFrameOffsetLegal(const MachineInstr *MI,
   case ARMII::AddrMode5: {
     // VFP address mode.
     const MachineOperand &OffOp = MI->getOperand(i+1);
-    int InstrOffs = ARM_AM::getAM5Offset(OffOp.getImm());
+    InstrOffs = ARM_AM::getAM5Offset(OffOp.getImm());
     if (ARM_AM::getAM5Op(OffOp.getImm()) == ARM_AM::sub)
       InstrOffs = -InstrOffs;
     NumBits = 8;