summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen/BranchFolding.cpp
diff options
context:
space:
mode:
authorMichael Zolotukhin <mzolotukhin@apple.com>2016-01-09 23:53:16 +0000
committerMichael Zolotukhin <mzolotukhin@apple.com>2016-01-09 23:53:16 +0000
commit0fc89c67cc466ea8f23066272d7988c8f49ad5ee (patch)
tree4f8ff8f493bb6929ea92f795dcbf95bbd188d9c6 /llvm/lib/CodeGen/BranchFolding.cpp
parent98c4458814ec92fcb9a9e76748de674107467014 (diff)
downloadbcm5719-llvm-0fc89c67cc466ea8f23066272d7988c8f49ad5ee.tar.gz
bcm5719-llvm-0fc89c67cc466ea8f23066272d7988c8f49ad5ee.zip
Revert "[BranchFolding] Set correct mem refs"
This reverts commit 1ff11017d2669b933b29fcbb6451cfcda34ad693. llvm-svn: 257270
Diffstat (limited to 'llvm/lib/CodeGen/BranchFolding.cpp')
-rw-r--r--llvm/lib/CodeGen/BranchFolding.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/BranchFolding.cpp b/llvm/lib/CodeGen/BranchFolding.cpp
index df5cac5a9f7..60803490a5d 100644
--- a/llvm/lib/CodeGen/BranchFolding.cpp
+++ b/llvm/lib/CodeGen/BranchFolding.cpp
@@ -780,7 +780,7 @@ removeMMOsFromMemoryOperations(MachineBasicBlock::iterator MBBIStartPos,
assert(MBBICommon->isIdenticalTo(&*MBBI) && "Expected matching MIIs!");
if (MBBICommon->mayLoad() || MBBICommon->mayStore())
- MBBICommon->setMemRefs(MBBICommon->mergeMemRefsWith(*MBBI));
+ MBBICommon->setMemRefs(MBBI->mergeMemRefsWith(*MBBI));
++MBBI;
++MBBICommon;
OpenPOWER on IntegriCloud