[llvm-branch-commits] [llvm-branch] r120656 - /llvm/branches/Apple/whitney/lib/Target/ARM/ARMFastISel.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Wed Dec  1 20:51:46 2010
New Revision: 120656

URL: http://llvm.org/viewvc/llvm-project?rev=120656&view=rev
Log:
Merge r119862:
--
Author: Eric Christopher <echristo at apple.com>
Date:   Fri Nov 19 22:39:56 2010 +0000

    Don't need to save piecemeal now.

Modified:
    llvm/branches/Apple/whitney/lib/Target/ARM/ARMFastISel.cpp

Modified: llvm/branches/Apple/whitney/lib/Target/ARM/ARMFastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/lib/Target/ARM/ARMFastISel.cpp?rev=120656&r1=120655&r2=120656&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/lib/Target/ARM/ARMFastISel.cpp (original)
+++ llvm/branches/Apple/whitney/lib/Target/ARM/ARMFastISel.cpp Wed Dec  1 20:51:46 2010
@@ -645,8 +645,7 @@
       break;
     }
     case Instruction::GetElementPtr: {
-      int SavedOffset = Addr.Offset;
-      unsigned SavedBase = Addr.Base.Reg;
+      Address SavedAddr = Addr;
       int TmpOffset = Addr.Offset;
 
       // Iterate through the GEP folding the constants into offsets where
@@ -687,8 +686,7 @@
       if (ARMComputeAddress(U->getOperand(0), Addr)) return true;
 
       // We failed, restore everything and try the other options.
-      Addr.Offset = SavedOffset;
-      Addr.Base.Reg = SavedBase;
+      Addr = SavedAddr;
 
       unsupported_gep:
       break;