From owner-svn-ports-head@freebsd.org Fri Apr 27 17:41:19 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DFE4DFADF23; Fri, 27 Apr 2018 17:41:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 92E326EF1F; Fri, 27 Apr 2018 17:41:18 +0000 (UTC) (envelope-from jbeich@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8DCB11AC4; Fri, 27 Apr 2018 17:41:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3RHfIpL035032; Fri, 27 Apr 2018 17:41:18 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3RHfIjD035030; Fri, 27 Apr 2018 17:41:18 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804271741.w3RHfIjD035030@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 27 Apr 2018 17:41:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468476 - in head/devel/llvm60: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/devel/llvm60: . files X-SVN-Commit-Revision: 468476 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Apr 2018 17:41:19 -0000 Author: jbeich Date: Fri Apr 27 17:41:18 2018 New Revision: 468476 URL: https://svnweb.freebsd.org/changeset/ports/468476 Log: devel/llvm60: apply i386 crashfix after r467849 PR: 227686, 227698 Approved by: portmgr blanket Added: head/devel/llvm60/files/patch-fsvn-r332898 (contents, props changed) Modified: head/devel/llvm60/Makefile (contents, props changed) Modified: head/devel/llvm60/Makefile ============================================================================== --- head/devel/llvm60/Makefile Fri Apr 27 17:16:24 2018 (r468475) +++ head/devel/llvm60/Makefile Fri Apr 27 17:41:18 2018 (r468476) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 6.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel lang MASTER_SITES= http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} PKGNAMESUFFIX= ${LLVM_SUFFIX} Added: head/devel/llvm60/files/patch-fsvn-r332898 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm60/files/patch-fsvn-r332898 Fri Apr 27 17:41:18 2018 (r468476) @@ -0,0 +1,62 @@ +commit de8877900af2a4af25465be5fde7e460ffee08a2 +Author: dim +Date: Mon Apr 23 23:07:57 2018 +0000 + + Pull in r329771 from upstream llvm trunk (by Craig Topper): + + [X86] In X86FlagsCopyLowering, when rewriting a memory setcc we need + to emit an explicit MOV8mr instruction. + + Previously the code only knew how to handle setcc to a register. + + This should fix a crash in the chromium build. + + This fixes various assertion failures while building ports targeting + i386: + * www/firefox: isReg() && "This is not a register operand!" + * www/iridium, www/qt5-webengine: (I.atEnd() || std::next(I) == + def_instr_end()) && "getVRegDef assumes a single definition or no + definition" + * devel/powerpc64-gcc: FromReg != ToReg && "Cannot replace a reg with + itself" + + Reported by: jbeich + PR: 225330, 227686, 227698, 227699 + MFC after: 1 week + X-MFC-With: r332833 + +diff --git lib/Target/X86/X86FlagsCopyLowering.cpp lib/Target/X86/X86FlagsCopyLowering.cpp +index 1b6369b7bfd9..1fd1c704d79a 100644 +--- lib/Target/X86/X86FlagsCopyLowering.cpp ++++ lib/Target/X86/X86FlagsCopyLowering.cpp +@@ -770,8 +770,27 @@ void X86FlagsCopyLoweringPass::rewriteSetCC(MachineBasicBlock &TestMBB, + if (!CondReg) + CondReg = promoteCondToReg(TestMBB, TestPos, TestLoc, Cond); + +- // Rewriting this is trivial: we just replace the register and remove the +- // setcc. +- MRI->replaceRegWith(SetCCI.getOperand(0).getReg(), CondReg); ++ // Rewriting a register def is trivial: we just replace the register and ++ // remove the setcc. ++ if (!SetCCI.mayStore()) { ++ assert(SetCCI.getOperand(0).isReg() && ++ "Cannot have a non-register defined operand to SETcc!"); ++ MRI->replaceRegWith(SetCCI.getOperand(0).getReg(), CondReg); ++ SetCCI.eraseFromParent(); ++ return; ++ } ++ ++ // Otherwise, we need to emit a store. ++ auto MIB = BuildMI(*SetCCI.getParent(), SetCCI.getIterator(), ++ SetCCI.getDebugLoc(), TII->get(X86::MOV8mr)); ++ // Copy the address operands. ++ for (int i = 0; i < X86::AddrNumOperands; ++i) ++ MIB.add(SetCCI.getOperand(i)); ++ ++ MIB.addReg(CondReg); ++ ++ MIB->setMemRefs(SetCCI.memoperands_begin(), SetCCI.memoperands_end()); ++ + SetCCI.eraseFromParent(); ++ return; + }