[llvm-branch-commits] [llvm-branch] r96025 - /llvm/branches/Apple/Hermes/lib/Target/ARM/ARMLoadStoreOptimizer.cpp

[Evan Cheng]

Author: evancheng
Date: Fri Feb 12 16:21:00 2010
New Revision: 96025

URL: http://llvm.org/viewvc/llvm-project?rev=96025&view=rev
Log:
Merge 96023.

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

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

==============================================================================
--- llvm/branches/Apple/Hermes/lib/Target/ARM/ARMLoadStoreOptimizer.cpp (original)
+++ llvm/branches/Apple/Hermes/lib/Target/ARM/ARMLoadStoreOptimizer.cpp Fri Feb 12 16:21:00 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;