From owner-svn-src-stable@freebsd.org  Wed Dec 14 17:27:45 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DAFE9C77F64;
 Wed, 14 Dec 2016 17:27:45 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AA0C115B2;
 Wed, 14 Dec 2016 17:27:45 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBEHRigd024507;
 Wed, 14 Dec 2016 17:27:44 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBEHRi6V024506;
 Wed, 14 Dec 2016 17:27:44 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201612141727.uBEHRi6V024506@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 14 Dec 2016 17:27:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r310082 - stable/10/contrib/llvm/lib/Analysis
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Dec 2016 17:27:46 -0000

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);