From nobody Wed Dec 22 10:06:18 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8F47F19063BC; Wed, 22 Dec 2021 10:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJprD1pR1z4YgG; Wed, 22 Dec 2021 10:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BB2821B26B; Wed, 22 Dec 2021 10:06:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BMA6Id9092510; Wed, 22 Dec 2021 10:06:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA6IRH092509; Wed, 22 Dec 2021 10:06:18 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:06:18 GMT Message-Id: <202112221006.1BMA6IRH092509@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 17dcdca63fb6 - stable/12 - Merge commit 46673763f from llvm git (by Craig Topper): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 17dcdca63fb6cb09a543fc448da74341ceb8ef94 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jAotmqNHOUvY9q1LswCfAFiPDmscCZrTOGyM/XorbL4=; b=mEZm1jazuY2l9Rw0anAqlA7QHmEFbenUU5bsGn1YYDGY/TbQ2DvXZt/aZL5LbQStTp0tZg 82+xoaR+zfAnrreBEApl08oXnLgA3ZBFfDHSso9Ta4fFum+rscja/fJAE0CbDYdahiEi9O idrWin+57JdD1lJCmsCwpM+nOW+oLJYEQ9ZBpU9arJNqGb6I/Jn0udO9oVelczC+WLB5Ae 0f0AbiG3a8mAFmxJa/i+uH7+xr9Rx0jTClwF7ueytzeikrZQojJN3fsOohSME+XrrL/Gwr JC723pVTZydDJxIZOZAMuAF0AeRXmL3EAkTXT1HivXSVIZ4bSp8Zw4foKW+94A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167580; a=rsa-sha256; cv=none; b=pygauxMuALGurVVlSu9ntvfV+Ndt3eQqlfZM1ZVfwg5ly1ivSAd8LuGbF1FuNz1sMJWxU6 T93NHzrAz2Lzqh0OzbVYyml8Ntv5L3mhMZokDj1taRJCIgeVn4gVBMh0zET+dYg0rBTNvp GCHZa+i70oZaFTUJ63JON0euyU/nja5b59gBaJWy6yrQkYDepxtzXJroOPGh6JAWTSYLFv 3vB2ssTuePy5qMRpRIGuWtxtBNFCspleZfm0xb78fNFNvfJzXR7WaLob8pUooXRHllsmmW cHCHrVY5y6F2iyFZHQS7HAGkpBZn8Mdi5eLz2In+mgb7F9QmtW9mRbE1EPC7og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=17dcdca63fb6cb09a543fc448da74341ceb8ef94 commit 17dcdca63fb6cb09a543fc448da74341ceb8ef94 Author: Dimitry Andric AuthorDate: 2020-09-17 19:47:41 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 10:01:18 +0000 Merge commit 46673763f from llvm git (by Craig Topper): [X86] Place new constant node in topological order in X86DAGToDAGISel::matchBitExtract Fixes PR47482 This should fix 'Assertion failed: (Op->getNodeId() != -1 && "Node has already selected predecessor node"), function DoInstructionSelection, file /usr/src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp, line 1149' when compiling part of the project_painter project, while targeting the bdver2 (or higher) CPU. Reported by: jkim MFC after: 6 weeks X-MFC-With: r364284 (cherry picked from commit 82bf979d530ecad0bc43231a77d9f1a67df53f11) --- contrib/llvm-project/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/llvm-project/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp b/contrib/llvm-project/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp index 3cd80cb04ab8..4768c5aa543d 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp @@ -3496,6 +3496,7 @@ bool X86DAGToDAGISel::matchBitExtract(SDNode *Node) { // Shift NBits left by 8 bits, thus producing 'control'. // This makes the low 8 bits to be zero. SDValue C8 = CurDAG->getConstant(8, DL, MVT::i8); + insertDAGNode(*CurDAG, SDValue(Node, 0), C8); SDValue Control = CurDAG->getNode(ISD::SHL, DL, MVT::i32, NBits, C8); insertDAGNode(*CurDAG, SDValue(Node, 0), Control);