summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorOwen Anderson <resistor@mac.com>2008-06-01 21:52:16 +0000
committerOwen Anderson <resistor@mac.com>2008-06-01 21:52:16 +0000
commitd071a8708ed2cb9790c6a77726fb183b4a364ef2 (patch)
treeae056a5a8f84ec52636fb4a8abdbd8211647d31c /llvm/lib
parent28172cb812606014c72e8b0f7086f23a60b62779 (diff)
downloadbcm5719-llvm-d071a8708ed2cb9790c6a77726fb183b4a364ef2.tar.gz
bcm5719-llvm-d071a8708ed2cb9790c6a77726fb183b4a364ef2.zip
Don't remove the memcpy when call slot substitution fails.
llvm-svn: 51848
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp b/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp
index 22a00ba3d3e..c599928d82e 100644
--- a/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp
+++ b/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp
@@ -580,14 +580,19 @@ bool MemCpyOpt::performCallSlotOptzn(MemCpyInst *cpy, CallInst *C) {
return false;
// 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 (cpySrc->getType() != cpyDest->getType())
cpyDest = CastInst::CreatePointerCast(cpyDest, cpySrc->getType(),
cpyDest->getName(), C);
+ changedArgument = true;
CS.setArgument(i, cpyDest);
}
+ if (!changedArgument)
+ return false;
+
// Drop any cached information about the call, because we may have changed
// its dependence information by changing its parameter.
MemoryDependenceAnalysis& MD = getAnalysis<MemoryDependenceAnalysis>();
OpenPOWER on IntegriCloud