From: Chad Rosier <mcrosier@codeaurora.org>
Date: Tue, 8 Mar 2016 17:16:38 +0000 (+0000)
Subject: [AArch64] Add MMOs to unscaled pairs.
X-Git-Tag: llvmorg-3.9.0-rc1~12247
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e40b9513a97f30fd7ff5eb359a6a1c3d7aea2b1a;p=platform%2Fupstream%2Fllvm.git

[AArch64] Add MMOs to unscaled pairs.

Test to be committed in follow up commit, per discussion in D17097.
http://reviews.llvm.org/D17097

llvm-svn: 262942
---

diff --git a/llvm/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp b/llvm/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp
index 178390e..b744dc2 100644
--- a/llvm/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp
+++ b/llvm/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp
@@ -888,9 +888,8 @@ AArch64LoadStoreOpt::mergePairedInsns(MachineBasicBlock::iterator I,
             .addOperand(getLdStRegOp(RtMI))
             .addOperand(getLdStRegOp(Rt2MI))
             .addOperand(BaseRegOp)
-            .addImm(OffsetImm);
-  // FIXME: Copy the mem operands from the source instructions. The MI scheduler
-  // needs these to reason about loads/stores.
+            .addImm(OffsetImm)
+            .setMemRefs(I->mergeMemRefsWith(*Paired));
 
   (void)MIB;