From a6a38aa5a5b6c31981f574479d734bf60de1e4d8 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Tue, 29 Apr 2008 21:26:06 +0000 Subject: Fix a bug in memcpyopt where the memcpy-memcpy transform was never being applied because we were checking for it in the wrong order. This caused a miscompilation because the return slot optimization assumes that the call it is dealing with is NOT a memcpy. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@50444 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Scalar/MemCpyOptimizer.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/Transforms') diff --git a/lib/Transforms/Scalar/MemCpyOptimizer.cpp b/lib/Transforms/Scalar/MemCpyOptimizer.cpp index d2723ab..9a39c8f 100644 --- a/lib/Transforms/Scalar/MemCpyOptimizer.cpp +++ b/lib/Transforms/Scalar/MemCpyOptimizer.cpp @@ -615,10 +615,12 @@ bool MemCpyOpt::processMemCpy(MemCpyInst* M) { if (dep == MemoryDependenceAnalysis::None || dep == MemoryDependenceAnalysis::NonLocal) return false; - else if (CallInst* C = dyn_cast(dep)) - return performCallSlotOptzn(M, C); - else if (!isa(dep)) - return false; + else if (!isa(dep)) { + if (CallInst* C = dyn_cast(dep)) + return performCallSlotOptzn(M, C); + else + return false; + } MemCpyInst* MDep = cast(dep); -- cgit v1.1