From owner-svn-src-stable-10@freebsd.org  Sun Mar 13 18:32:12 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 35A6BACFF41;
 Sun, 13 Mar 2016 18:32:12 +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 0281CBDB;
 Sun, 13 Mar 2016 18:32:11 +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 u2DIWAPd012212;
 Sun, 13 Mar 2016 18:32:10 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2DIWA7q012211;
 Sun, 13 Mar 2016 18:32:10 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201603131832.u2DIWA7q012211@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: Sun, 13 Mar 2016 18:32:10 +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: r296800 - stable/10/contrib/llvm/lib/CodeGen
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-10@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Mar 2016 18:32:12 -0000

Author: dim
Date: Sun Mar 13 18:32:10 2016
New Revision: 296800
URL: https://svnweb.freebsd.org/changeset/base/296800

Log:
  Pull in r219512 from upstream llvm trunk (by Hal Finkel):
  
    [MiSched] Fix a logic error in tryPressure()
  
    Fixes a logic error in the MachineScheduler found by Steve Montgomery
    (and confirmed by Andy). This has gone unfixed for months because the
    fix has been found to introduce some small performance regressions.
    However, Andy has recommended that, at this point, we fix this to
    avoid further dependence on the incorrect behavior (and then
    follow-up separately on any regressions), and I agree.
  
    Fixes PR18883.
  
  This fixes a possible "ran out of registers" error when compiling
  www/firefox 45.0 on i386.
  
  Direct commit to stable/10, because head already has this fix since the
  llvm/clang 3.6.0 import.
  
  PR:		207837

Modified:
  stable/10/contrib/llvm/lib/CodeGen/MachineScheduler.cpp

Modified: stable/10/contrib/llvm/lib/CodeGen/MachineScheduler.cpp
==============================================================================
--- stable/10/contrib/llvm/lib/CodeGen/MachineScheduler.cpp	Sun Mar 13 14:53:12 2016	(r296799)
+++ stable/10/contrib/llvm/lib/CodeGen/MachineScheduler.cpp	Sun Mar 13 18:32:10 2016	(r296800)
@@ -2365,8 +2365,8 @@ static bool tryPressure(const PressureCh
   }
   // If one candidate decreases and the other increases, go with it.
   // Invalid candidates have UnitInc==0.
-  if (tryLess(TryP.getUnitInc() < 0, CandP.getUnitInc() < 0, TryCand, Cand,
-              Reason)) {
+  if (tryGreater(TryP.getUnitInc() < 0, CandP.getUnitInc() < 0, TryCand, Cand,
+                 Reason)) {
     return true;
   }
   // If the candidates are decreasing pressure, reverse priority.