From 30bec4f2685289b3c706fb1e2540c033e31594c3 Mon Sep 17 00:00:00 2001 From: dim Date: Wed, 14 Dec 2016 17:27:44 +0000 Subject: Merge r309860 from stable/9, as this also applies to stable/10: Fix libllvmanalysis build failure after r309857: on stable/9, llvm is compiled by gcc, and without -std=c++11, so the nullptr keyword is unknown. Use the old-school plain zero syntax instead. --- contrib/llvm/lib/Analysis/LazyValueInfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/llvm/lib/Analysis/LazyValueInfo.cpp') diff --git a/contrib/llvm/lib/Analysis/LazyValueInfo.cpp b/contrib/llvm/lib/Analysis/LazyValueInfo.cpp index dd0f4cc0..2fa6c8f 100644 --- a/contrib/llvm/lib/Analysis/LazyValueInfo.cpp +++ b/contrib/llvm/lib/Analysis/LazyValueInfo.cpp @@ -1051,7 +1051,7 @@ static bool isKnownNonConstant(Value *V) { Constant *LazyValueInfo::getConstant(Value *V, BasicBlock *BB) { // Bail out early if V is known not to be a Constant. if (isKnownNonConstant(V)) - return nullptr; + return 0; LVILatticeVal Result = getCache(PImpl).getValueInBlock(V, BB); -- cgit v1.1