[llvm-commits] [llvm] r72757 - in /llvm/trunk: lib/Target/ARM/ARMLoadStoreOptimizer.cpp test/CodeGen/ARM/str_pre-2.ll

[Evan Cheng]

Author: evancheng
Date: Wed Jun  3 02:40:47 2009
New Revision: 72757

URL: http://llvm.org/viewvc/llvm-project?rev=72757&view=rev
Log:
Temporarily revert 72756 for now.

Modified:
    llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
    llvm/trunk/test/CodeGen/ARM/str_pre-2.ll

Modified: llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp?rev=72757&r1=72756&r2=72757&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp Wed Jun  3 02:40:47 2009
@@ -709,13 +709,6 @@
 
         // RS may be pointing to an instruction that's deleted. 
         RS->skipTo(prior(MBBI));
-      } else if (NumMemOps == 1) {
-        // Try folding preceeding/trailing base inc/dec into the single
-        // load/store.
-        if (mergeBaseUpdateLoadStore(MBB, MemOps[0].MBBI, TII, Advance, MBBI)) {
-          ++NumMerges;
-          RS->skipTo(prior(MBBI));
-        }
       }
 
       CurrBase = 0;

Modified: llvm/trunk/test/CodeGen/ARM/str_pre-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/str_pre-2.ll?rev=72757&r1=72756&r2=72757&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/ARM/str_pre-2.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/str_pre-2.ll Wed Jun  3 02:40:47 2009
@@ -1,5 +1,6 @@
 ; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnu | grep {str.*\\!}
 ; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnu | grep {ldr.*\\\[.*\], #+4}
+; XFAIL: *
 
 @b = external global i64*