diff options
| -rw-r--r-- | lib/Transforms/Scalar/MemCpyOptimizer.cpp | 17 | ||||
| -rw-r--r-- | test/Transforms/MemCpyOpt/2008-06-01-MemCpy-MemMove.ll | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/lib/Transforms/Scalar/MemCpyOptimizer.cpp b/lib/Transforms/Scalar/MemCpyOptimizer.cpp index c599928d82..18f5f0c130 100644 --- a/lib/Transforms/Scalar/MemCpyOptimizer.cpp +++ b/lib/Transforms/Scalar/MemCpyOptimizer.cpp @@ -554,10 +554,17 @@ bool MemCpyOpt::performCallSlotOptzn(MemCpyInst *cpy, CallInst *C) { User* UI = srcUseList.back(); srcUseList.pop_back(); - if (isa<GetElementPtrInst>(UI) || isa<BitCastInst>(UI)) { + if (isa<BitCastInst>(UI)) { for (User::use_iterator I = UI->use_begin(), E = UI->use_end(); I != E; ++I) srcUseList.push_back(*I); + } else if (GetElementPtrInst* G = dyn_cast<GetElementPtrInst>(UI)) { + if (G->hasAllZeroIndices()) + for (User::use_iterator I = UI->use_begin(), E = UI->use_end(); + I != E; ++I) + srcUseList.push_back(*I); + else + return false; } else if (UI != C && UI != cpy) { return false; } @@ -582,12 +589,16 @@ bool MemCpyOpt::performCallSlotOptzn(MemCpyInst *cpy, CallInst *C) { // All the checks have passed, so do the transformation. bool changedArgument = false; for (unsigned i = 0; i < CS.arg_size(); ++i) - if (CS.getArgument(i) == cpySrc) { + if (CS.getArgument(i)->stripPointerCasts() == cpySrc) { if (cpySrc->getType() != cpyDest->getType()) cpyDest = CastInst::CreatePointerCast(cpyDest, cpySrc->getType(), cpyDest->getName(), C); changedArgument = true; - CS.setArgument(i, cpyDest); + if (CS.getArgument(i)->getType() != cpyDest->getType()) + CS.setArgument(i, CastInst::CreatePointerCast(cpyDest, + CS.getArgument(i)->getType(), cpyDest->getName(), C)); + else + CS.setArgument(i, cpyDest); } if (!changedArgument) diff --git a/test/Transforms/MemCpyOpt/2008-06-01-MemCpy-MemMove.ll b/test/Transforms/MemCpyOpt/2008-06-01-MemCpy-MemMove.ll index 598020949d..16d2df4bac 100644 --- a/test/Transforms/MemCpyOpt/2008-06-01-MemCpy-MemMove.ll +++ b/test/Transforms/MemCpyOpt/2008-06-01-MemCpy-MemMove.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -memcpyopt | llvm-dis | grep {call.*memcpy.*} +; RUN: llvm-as < %s | opt -memcpyopt | llvm-dis | grep {call.*memmove.*arg1.*} ; PR2401 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32" |