From owner-svn-src-projects@freebsd.org  Sat Aug 27 11:51:09 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 7CB08B7771C
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sat, 27 Aug 2016 11:51:09 +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 41705E89;
 Sat, 27 Aug 2016 11:51:09 +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 u7RBp8eZ027358;
 Sat, 27 Aug 2016 11:51:08 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7RBp87C027356;
 Sat, 27 Aug 2016 11:51:08 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201608271151.u7RBp87C027356@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: Sat, 27 Aug 2016 11:51:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r304906 - in projects/clang390-import:
 contrib/llvm/lib/Transforms/Scalar lib/clang/include/clang/Basic
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Aug 2016 11:51:09 -0000

Author: dim
Date: Sat Aug 27 11:51:08 2016
New Revision: 304906
URL: https://svnweb.freebsd.org/changeset/base/304906

Log:
  Update llvm to release_39 branch r279689.

Modified:
  projects/clang390-import/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp
  projects/clang390-import/lib/clang/include/clang/Basic/Version.inc
Directory Properties:
  projects/clang390-import/contrib/llvm/   (props changed)
  projects/clang390-import/contrib/llvm/tools/clang/   (props changed)

Modified: projects/clang390-import/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp
==============================================================================
--- projects/clang390-import/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp	Sat Aug 27 11:45:05 2016	(r304905)
+++ projects/clang390-import/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp	Sat Aug 27 11:51:08 2016	(r304906)
@@ -1538,17 +1538,6 @@ static bool tryToReplaceWithConstant(SCC
   return true;
 }
 
-static bool tryToReplaceInstWithConstant(SCCPSolver &Solver, Instruction *Inst,
-                                         bool shouldEraseFromParent) {
-  if (!tryToReplaceWithConstant(Solver, Inst))
-    return false;
-
-  // Delete the instruction.
-  if (shouldEraseFromParent)
-    Inst->eraseFromParent();
-  return true;
-}
-
 // runSCCP() - Run the Sparse Conditional Constant Propagation algorithm,
 // and return true if the function was modified.
 //
@@ -1597,8 +1586,9 @@ static bool runSCCP(Function &F, const D
       if (Inst->getType()->isVoidTy() || isa<TerminatorInst>(Inst))
         continue;
 
-      if (tryToReplaceInstWithConstant(Solver, Inst,
-                                       true /* shouldEraseFromParent */)) {
+      if (tryToReplaceWithConstant(Solver, Inst)) {
+        if (isInstructionTriviallyDead(Inst))
+          Inst->eraseFromParent();
         // Hey, we just changed something!
         MadeChanges = true;
         ++NumInstRemoved;
@@ -1789,10 +1779,9 @@ static bool runIPSCCP(Module &M, const D
         Instruction *Inst = &*BI++;
         if (Inst->getType()->isVoidTy())
           continue;
-        if (tryToReplaceInstWithConstant(
-                Solver, Inst,
-                !isa<CallInst>(Inst) &&
-                    !isa<TerminatorInst>(Inst) /* shouldEraseFromParent */)) {
+        if (tryToReplaceWithConstant(Solver, Inst)) {
+          if (!isa<CallInst>(Inst) && !isa<TerminatorInst>(Inst))
+            Inst->eraseFromParent();
           // Hey, we just changed something!
           MadeChanges = true;
           ++IPNumInstRemoved;

Modified: projects/clang390-import/lib/clang/include/clang/Basic/Version.inc
==============================================================================
--- projects/clang390-import/lib/clang/include/clang/Basic/Version.inc	Sat Aug 27 11:45:05 2016	(r304905)
+++ projects/clang390-import/lib/clang/include/clang/Basic/Version.inc	Sat Aug 27 11:51:08 2016	(r304906)
@@ -7,4 +7,4 @@
 
 #define	CLANG_VENDOR			"FreeBSD "
 
-#define	SVN_REVISION			"279477"
+#define	SVN_REVISION			"279689"