commit e40b9513a97f30fd7ff5eb359a6a1c3d7aea2b1a
author Chad Rosier <mcrosier@codeaurora.org> Tue Mar 08 17:16:38 2016 +0000
committer Chad Rosier <mcrosier@codeaurora.org> Tue Mar 08 17:16:38 2016 +0000
tree 3296f0e841f395403c1b8ed77035ed47315b80cf
parent 0650192094678d18825b60f8ee8fd6cd003303cb

[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

llvm/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp

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 @@
             .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;