From: Nuno Lopes <nunoplopes@sapo.pt>
Date: Wed, 1 Aug 2012 16:58:51 +0000 (+0000)
Subject: (hopefuly) fix the remaining cases where null wasnt expected (PR13497).
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=28ad863f6c00baa3ace5ca3f0f6a1fdc52197d8e;p=oota-llvm.git

(hopefuly) fix the remaining cases where null wasnt expected (PR13497).
I'll commit a test to the clang tree.

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

diff --git a/lib/Transforms/Utils/BuildLibCalls.cpp b/lib/Transforms/Utils/BuildLibCalls.cpp
index 1ebd5b7061c..89949bb2a28 100644
--- a/lib/Transforms/Utils/BuildLibCalls.cpp
+++ b/lib/Transforms/Utils/BuildLibCalls.cpp
@@ -526,6 +526,8 @@ bool SimplifyFortifiedLibCalls::fold(CallInst *CI, const TargetData *TD,
     if (isFoldable(2, 1, true)) {
       Value *Ret = EmitStrCpy(CI->getArgOperand(0), CI->getArgOperand(1), B, TD,
                               TLI, Name.substr(2, 6));
+      if (!Ret)
+	return false;
       replaceCall(Ret);
       return true;
     }
@@ -545,6 +547,8 @@ bool SimplifyFortifiedLibCalls::fold(CallInst *CI, const TargetData *TD,
       Value *Ret = EmitStrNCpy(CI->getArgOperand(0), CI->getArgOperand(1),
                                CI->getArgOperand(2), B, TD, TLI,
                                Name.substr(2, 7));
+      if (!Ret)
+	return false;
       replaceCall(Ret);
       return true;
     }