[llvm-commits] [llvm] r68905 - /llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp

[Chris Lattner]

Author: lattner
Date: Sun Apr 12 13:22:33 2009
New Revision: 68905

URL: http://llvm.org/viewvc/llvm-project?rev=68905&view=rev
Log:
"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!


Modified:
    llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp?rev=68905&r1=68904&r2=68905&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp Sun Apr 12 13:22:33 2009
@@ -582,7 +582,7 @@
 
     // 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;
   }
 };