diff options
author | dim <dim@FreeBSD.org> | 2016-12-14 17:27:44 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2016-12-14 17:27:44 +0000 |
commit | 30bec4f2685289b3c706fb1e2540c033e31594c3 (patch) | |
tree | 620746bdff578a37e58d976b18a22eea851bfbae /contrib/llvm/lib/Analysis | |
parent | 8103142d964dbd79c7ca86e6a23514e6a11ed0b0 (diff) | |
download | FreeBSD-src-30bec4f2685289b3c706fb1e2540c033e31594c3.zip FreeBSD-src-30bec4f2685289b3c706fb1e2540c033e31594c3.tar.gz |
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.
Diffstat (limited to 'contrib/llvm/lib/Analysis')
-rw-r--r-- | contrib/llvm/lib/Analysis/LazyValueInfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |