[llvm-branch-commits] [llvm-branch] r81890 - in /llvm/branches/Apple/Bender-SWB: lib/Transforms/Scalar/MemCpyOptimizer.cpp test/Transforms/MemCpyOpt/align.ll

[Bill Wendling]

Author: void
Date: Tue Sep 15 13:33:29 2009
New Revision: 81890

URL: http://llvm.org/viewvc/llvm-project?rev=81890&view=rev
Log:
$ svn merge -c 81810 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r81810 into '.':
A    test/Transforms/MemCpyOpt/align.ll
U    lib/Transforms/Scalar/MemCpyOptimizer.cpp


Added:
    llvm/branches/Apple/Bender-SWB/test/Transforms/MemCpyOpt/align.ll
      - copied unchanged from r81810, llvm/trunk/test/Transforms/MemCpyOpt/align.ll
Modified:
    llvm/branches/Apple/Bender-SWB/lib/Transforms/Scalar/MemCpyOptimizer.cpp

Modified: llvm/branches/Apple/Bender-SWB/lib/Transforms/Scalar/MemCpyOptimizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Bender-SWB/lib/Transforms/Scalar/MemCpyOptimizer.cpp?rev=81890&r1=81889&r2=81890&view=diff

==============================================================================
--- llvm/branches/Apple/Bender-SWB/lib/Transforms/Scalar/MemCpyOptimizer.cpp (original)
+++ llvm/branches/Apple/Bender-SWB/lib/Transforms/Scalar/MemCpyOptimizer.cpp Tue Sep 15 13:33:29 2009
@@ -270,6 +270,7 @@
   if (Start < I->Start) {
     I->Start = Start;
     I->StartPtr = SI->getPointerOperand();
+    I->Alignment = SI->getAlignment();
   }
     
   // Now we know that Start <= I->End and Start >= I->Start (so the startpoint