[llvm-branch-commits] [llvm-branch] r101140 - /llvm/branches/Apple/Morbo/lib/Transforms/Utils/BuildLibCalls.cpp

[Eric Christopher]

Author: echristo
Date: Tue Apr 13 11:45:19 2010
New Revision: 101140

URL: http://llvm.org/viewvc/llvm-project?rev=101140&view=rev
Log:
Merge 101139 from mainline.

Modified:
    llvm/branches/Apple/Morbo/lib/Transforms/Utils/BuildLibCalls.cpp

Modified: llvm/branches/Apple/Morbo/lib/Transforms/Utils/BuildLibCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/Transforms/Utils/BuildLibCalls.cpp?rev=101140&r1=101139&r2=101140&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/Transforms/Utils/BuildLibCalls.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/Transforms/Utils/BuildLibCalls.cpp Tue Apr 13 11:45:19 2010
@@ -478,6 +478,7 @@
         FT->getParamType(0) != Type::getInt8PtrTy(Context) ||
         !FT->getParamType(2)->isIntegerTy() ||
         FT->getParamType(3) != TD->getIntPtrType(Context))
+      return false;
     
     if (isFoldable(4, 3, false)) {
       Value *Ret = EmitStrNCpy(CI->getOperand(1), CI->getOperand(2),