From: Evan Cheng <evan.cheng@apple.com>
Date: Wed, 3 Jun 2009 07:40:47 +0000 (+0000)
Subject: Temporarily revert 72756 for now.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=70fd60bd57250799672378fa2f7c5e804cb3d98d;p=oota-llvm.git

Temporarily revert 72756 for now.

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

diff --git a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
index 108c6dd4d6b..09b8ce07d22 100644
--- a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
+++ b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
@@ -709,13 +709,6 @@ bool ARMLoadStoreOpt::LoadStoreMultipleOpti(MachineBasicBlock &MBB) {
 
         // 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;
diff --git a/test/CodeGen/ARM/str_pre-2.ll b/test/CodeGen/ARM/str_pre-2.ll
index e9f194574e4..247465f3320 100644
--- a/test/CodeGen/ARM/str_pre-2.ll
+++ b/test/CodeGen/ARM/str_pre-2.ll
@@ -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*