[llvm-branch-commits] [llvm-branch] r96047 - /llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMLoadStoreOptimizer.cpp

[Bob Wilson]

Author: bwilson
Date: Fri Feb 12 17:53:44 2010
New Revision: 96047

URL: http://llvm.org/viewvc/llvm-project?rev=96047&view=rev
Log:
--- Merging r96023 into '.':
U    lib/Target/ARM/ARMLoadStoreOptimizer.cpp

Modified:
    llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMLoadStoreOptimizer.cpp

Modified: llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMLoadStoreOptimizer.cpp?rev=96047&r1=96046&r2=96047&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMLoadStoreOptimizer.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMLoadStoreOptimizer.cpp Fri Feb 12 17:53:44 2010
@@ -350,7 +350,8 @@
       : ARMRegisterInfo::getRegisterNumbering(Reg);
     // AM4 - register numbers in ascending order.
     // AM5 - consecutive register numbers in ascending order.
-    if (NewOffset == Offset + (int)Size &&
+    if (Reg != ARM::SP &&
+        NewOffset == Offset + (int)Size &&
         ((isAM4 && RegNum > PRegNum) || RegNum == PRegNum+1)) {
       Offset += Size;
       PRegNum = RegNum;