From nobody Wed Mar 23 19:59:31 2022 X-Original-To: dev-commits-src-branches@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 149A71A46C48; Wed, 23 Mar 2022 19:59:32 +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 4KNzhg42mCz4VKy; Wed, 23 Mar 2022 19:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648065571; 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=umIpv0eMxUKLcmOIOHWHZPwYjStNzwykP4RHANGbols=; b=PNXhrtqu4N0X5JQFKyOoP0A0fOZ/Ej+g2StYfES2qBkDcfHP0LdqCzrmVRccLXmVZ9AQIr WyA2cWeAOmXjoTdkR9i9UiwjDSKxdeZlhoHyedYxS1+WUiZLXDgcOU9Qwx/XC6Hm30mu7t T97MqFFC95fQL+8tTBFNmYBGYvgRDO/FYSLQCFBdmBLdhbWEyxXBZwmaPslz8JI89VPUG8 CbXq0FJsquUrm6dEvnFWKsSZ86g3Yg4wmm2UnAWfgiXz4AdYWcZVfeaZYBXatW38VY6DJq Fpoh4QzmXV31Nz608cQneXiA8uDxrIeoTz5QwPgmFGWJK94GLH8O/TT83aHsFg== 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 233941A30; Wed, 23 Mar 2022 19:59:31 +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 22NJxVqE021312; Wed, 23 Mar 2022 19:59:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22NJxV2Y021311; Wed, 23 Mar 2022 19:59:31 GMT (envelope-from git) Date: Wed, 23 Mar 2022 19:59:31 GMT Message-Id: <202203231959.22NJxV2Y021311@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: c4cacdd447ba - stable/12 - Apply llvm fix for assertion compiling certain versions of Wine List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: c4cacdd447bae53964f439cb94acd9f5cc6a4c14 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648065571; 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=umIpv0eMxUKLcmOIOHWHZPwYjStNzwykP4RHANGbols=; b=jmGRId72wBTzBmS8Y0N3xrn21w1z8QIIreIustILw89zYSv6ET5BVVMKVZMe0EhpTpE6Dr Krb75LJUNtqMg/KkRxyXyEFAcA0eNInjgqm/COAUT8+16us+jUQhAVJpq/bM9R4p7J5gCN ESk+knlYb8RBE9wI9LiSI1Ds5HrfQZLuabYwtc8r1rJGvkHvNqY9SvypAPBukK4P37Hi3s kYV7S3ypyWUfJTVniMhvgfQgdrcz48+g0zW4JrycUtDJ90IZxbD7RhKPrQu2J9iRlKqQDQ V+ZRuoOY+Ev9XvV1Fy4JZbIeNhHc6V2a8WR9ny4plZmoF32zwP7Mj6my7MYnww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648065571; a=rsa-sha256; cv=none; b=JBJ4NaDM92EVsrXiTALYhV99WkeG7AX/RzX4UQl3R39E4rZNAzb7m5/Kombxm7BCpQW4GO bOPntxKZdVTBMILvojXS+keFXm/ZWINhZJqR86JMQQX734PikAp/BINGtf/KzARjLu+8Ir 8VYm63iymIeR7kDWhaD1AfL9ELn3740j2cHMK4f29w1mev0YahQLiqL5sLH73AUBZyA4Y5 KZkUTOhLKLPjZiFIlLOPmSbjVGshlOCZdSOLY08UMxhhbNBcyc0nVurkthH11XxzS2yJjE TWrw0mvCki5v2D4VaD7edemHp0HLd+mlX9wqn9cSnpd4YvHE6MMafkjeH6wrKQ== 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=c4cacdd447bae53964f439cb94acd9f5cc6a4c14 commit c4cacdd447bae53964f439cb94acd9f5cc6a4c14 Author: Dimitry Andric AuthorDate: 2022-03-19 19:59:04 +0000 Commit: Dimitry Andric CommitDate: 2022-03-23 19:57:26 +0000 Apply llvm fix for assertion compiling certain versions of Wine Merge commit b9ca73e1a8fd from llvm git (by Stephen Tozer): [DebugInfo] Correctly handle arrays with 0-width elements in GEP salvaging Fixes an issue where GEP salvaging did not properly account for GEP instructions which stepped over array elements of width 0 (effectively a no-op). This unnecessarily produced long expressions by appending `... + (x * 0)` and potentially extended the number of SSA values used in the dbg.value. This also erroneously triggered an assert in the salvage function that the element width would be strictly positive. These issues are resolved by simply ignoring these useless operands. Reviewed By: aprantl Differential Revision: https://reviews.llvm.org/D111809 PR: 262608 Reported by: Damjan Jovanovic MFC after: 3 days (cherry picked from commit 1b3bef43e3cb7fb0ab49b813839915514c1134cc) --- contrib/llvm-project/llvm/lib/IR/Operator.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/IR/Operator.cpp b/contrib/llvm-project/llvm/lib/IR/Operator.cpp index 18a1c84933e0..f9dbed31c44c 100644 --- a/contrib/llvm-project/llvm/lib/IR/Operator.cpp +++ b/contrib/llvm-project/llvm/lib/IR/Operator.cpp @@ -190,12 +190,14 @@ bool GEPOperator::collectOffset( if (STy || ScalableType) return false; - // Insert an initial offset of 0 for V iff none exists already, then - // increment the offset by IndexedSize. - VariableOffsets.insert({V, APInt(BitWidth, 0)}); APInt IndexedSize = APInt(BitWidth, DL.getTypeAllocSize(GTI.getIndexedType())); - VariableOffsets[V] += IndexedSize; + // Insert an initial offset of 0 for V iff none exists already, then + // increment the offset by IndexedSize. + if (!IndexedSize.isZero()) { + VariableOffsets.insert({V, APInt(BitWidth, 0)}); + VariableOffsets[V] += IndexedSize; + } } return true; }