From: Chris Lattner <sabre@nondot.org>
Date: Sun, 12 Apr 2009 18:22:33 +0000 (+0000)
Subject: "There was a typo in my previous patch which leads to miscompilation of
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5db4cdfc56f17959d3d0d3067af1b2346bcc0120;p=oota-llvm.git

"There was a typo in my previous patch which leads to miscompilation of
strncat :(

strncat(foo, "bar", 99)
would be optimized to
memcpy(foo+strlen(foo), "bar", 100, 1)
instead of
memcpy(foo+strlen(foo), "bar", 4, 1)"

Patch by Benjamin Kramer!



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@68905 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Transforms/Scalar/SimplifyLibCalls.cpp b/lib/Transforms/Scalar/SimplifyLibCalls.cpp
index 7e23c95cded..d53bc3f0ccc 100644
--- a/lib/Transforms/Scalar/SimplifyLibCalls.cpp
+++ b/lib/Transforms/Scalar/SimplifyLibCalls.cpp
@@ -582,7 +582,7 @@ struct VISIBILITY_HIDDEN StrNCatOpt : public StrCatOpt {
 
     // strncat(x, s, c) -> strcat(x, s)
     // s is constant so the strcat can be optimized further
-    EmitStrLenMemCpy(Src, Dst, Len, B);
+    EmitStrLenMemCpy(Src, Dst, SrcLen, B);
     return Dst;
   }
 };