From owner-svn-src-head@freebsd.org  Wed May  3 16:12:44 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 F0C7AD5C830;
 Wed,  3 May 2017 16:12:44 +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 C0577CEC;
 Wed,  3 May 2017 16:12:44 +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 v43GChZg043570;
 Wed, 3 May 2017 16:12:43 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v43GChWA043569;
 Wed, 3 May 2017 16:12:43 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201705031612.v43GChWA043569@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, 3 May 2017 16:12:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317751 - head/contrib/llvm/lib/Target/ARM
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 May 2017 16:12:45 -0000

Author: dim
Date: Wed May  3 16:12:43 2017
New Revision: 317751
URL: https://svnweb.freebsd.org/changeset/base/317751

Log:
  Pull in r301983 from upstream llvm trunk (by Tim Northover):
  
    ARM: avoid handing a deleted node back to TableGen during ISel.
  
    When we replaced the multiplicand the destination node might already
    exist. When that happens the original gets CSEd and deleted. However,
    it's actually used as the offset so nonsense is produced.
  
    Should fix PR32726.
  
  This fixes an assertion failure when building building www/firefox 53.0
  for arm.
  
  Reported by:	Bob Prohaska
  PR:		218782
  MFC after:	3 days

Modified:
  head/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp

Modified: head/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp	Wed May  3 16:03:33 2017	(r317750)
+++ head/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp	Wed May  3 16:12:43 2017	(r317751)
@@ -748,7 +748,9 @@ bool ARMDAGToDAGISel::SelectLdStSOReg(SD
     unsigned PowerOfTwo = 0;
     SDValue NewMulConst;
     if (canExtractShiftFromMul(Offset, 31, PowerOfTwo, NewMulConst)) {
+      HandleSDNode Handle(Offset);
       replaceDAGValue(Offset.getOperand(1), NewMulConst);
+      Offset = Handle.getValue();
       ShAmt = PowerOfTwo;
       ShOpcVal = ARM_AM::lsl;
     }
@@ -1428,7 +1430,9 @@ bool ARMDAGToDAGISel::SelectT2AddrModeSo
     unsigned PowerOfTwo = 0;
     SDValue NewMulConst;
     if (canExtractShiftFromMul(OffReg, 3, PowerOfTwo, NewMulConst)) {
+      HandleSDNode Handle(OffReg);
       replaceDAGValue(OffReg.getOperand(1), NewMulConst);
+      OffReg = Handle.getValue();
       ShAmt = PowerOfTwo;
     }
   }