| commit | 67cf9a723ba5cf0a711efcb317b241104b558779 | [log] [tgz] |
|---|---|---|
| author | Pete Cooper <peter_cooper@apple.com> | Thu Nov 19 05:56:52 2015 +0000 |
| committer | Pete Cooper <peter_cooper@apple.com> | Thu Nov 19 05:56:52 2015 +0000 |
| tree | e362be29f8f95e45470715ea59a93f2b8ad86de9 | |
| parent | 3b39e88ae0e1f260ebb89f874d8006cb0b87fd2f [diff] [blame] |
Revert "Change memcpy/memset/memmove to have dest and source alignments." This reverts commit r253511. This likely broke the bots in http://lab.llvm.org:8011/builders/clang-ppc64-elf-linux2/builds/20202 http://bb.pgr.jp/builders/clang-3stage-i686-linux/builds/3787 llvm-svn: 253543
diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp index d0ff84f..de5c68f 100644 --- a/llvm/lib/CodeGen/CodeGenPrepare.cpp +++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
@@ -1665,8 +1665,8 @@ unsigned Align = getKnownAlignment(MI->getDest(), *DL); if (MemTransferInst *MTI = dyn_cast<MemTransferInst>(MI)) Align = std::min(Align, getKnownAlignment(MTI->getSource(), *DL)); - if (Align > MI->getDestAlignment()) - MI->setDestAlignment(Align); + if (Align > MI->getAlignment()) + MI->setAlignment(ConstantInt::get(MI->getAlignmentType(), Align)); } }