svn commit: r310082 - stable/10/contrib/llvm/lib/Analysis

[Dimitry Andric]

Author: dim
Date: Wed Dec 14 17:27:44 2016
New Revision: 310082
URL: https://svnweb.freebsd.org/changeset/base/310082

Log:
  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.

Modified:
  stable/10/contrib/llvm/lib/Analysis/LazyValueInfo.cpp
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/llvm/lib/Analysis/LazyValueInfo.cpp
==============================================================================
--- stable/10/contrib/llvm/lib/Analysis/LazyValueInfo.cpp	Wed Dec 14 17:17:07 2016	(r310081)
+++ stable/10/contrib/llvm/lib/Analysis/LazyValueInfo.cpp	Wed Dec 14 17:27:44 2016	(r310082)
@@ -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);