From nobody Sun Apr 09 21:35:23 2023 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 4Pvll05V5Vz44JTq; Sun, 9 Apr 2023 21:35:24 +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 4Pvll01GZDz4MPs; Sun, 9 Apr 2023 21:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681076124; 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=1xILPY+PFimnlY0N1S5W8f/gCBjXyGMF/rbYuu6W4Lw=; b=nbeikTHYKQ4WI8h5hCFXCMDi6kR9NpbKUntBDKiaxfqhJ68lQCN3zV7hOS2Xng5Pzd0tr0 cVLheCee0uXMbL2q1zPsuejzahOQiWLMBx9J5SOskc64WktKQ9HlHCebK7Qe7xYFIclcln OXJue4tjCbVHnP0PEO/8u6F346vUg59HAjJrWNPI89T3O24QSrXem0fsQhqCYGeAPQch4N wbPHTGQteJx7zX1kETu0yACV01T2GfntrvMOA03FFMTMNDxLDnoCzJBhz9042hHYakDmvU N8kz6OfqVXmInukvOjrPPr1sLXnPdKXBHPlQsApBe06feOWEHrWKiP+jbHGIqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681076124; 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=1xILPY+PFimnlY0N1S5W8f/gCBjXyGMF/rbYuu6W4Lw=; b=ktd4fpzelc9V4o4y8UY0FL32G+XS7pqfT66jzNMzudXiyHUGtWR+58HGVp4E3z+vCqhinO eqTlY8SgykUyZskQX8gKfBC3LuepO6K1BS2eDkFfY/00PpGyyjGUW7eRp4Kq0ajRO1o+bl DPgExr3yPt8SUTz5/26wiF3EEl4/YcpY/SqgRTlQqTP+txSgtBCxY6mhUiAp8EexxrIoun PNvVqIyojMbr6uvvVMBzhNT/uqEZOBqEQjbmvtIf+wofpPXCd4Cd4xh1goVw7LusSf7sNB 6hAoPPw0hgKBxTmngQyVE2qMGViUvMh3mJheEKbPh4y2T/ue7ZJzEn1YAH/kaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681076124; a=rsa-sha256; cv=none; b=WJS+8HkQum84sBvcFI7v2linA4z8GVpT5ZGwW3LLO63nt2ST0oh7C4lyJFdlKZvrZ8O3e0 TnWqeK6z3tEJNbdPBGRtdnHGlN/6JWksS0MogNT/QYWz8Vt9Az6zCCmNAZ/O5vnzgPSVZe fFTBH4PWYYkJKjylmlE6IA0g9JR/x0Lwgcx16Wlp4W1acA7lFyHMYRss492EDKha0eVe5n oB/FjcCxOfEd1v+Wj3tkjmqr7ik+JupykF9yc2R/aCSPv2ynK7W1tqyc0g1hGx1zTj4n26 ZpVLLr+lqh1FUaZTNofEP58DXDLxQ69mSTKg8IfMM1zgGd0zNbaIUQNRU2QRIg== 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 4Pvlkz4fF7zPF2; Sun, 9 Apr 2023 21:35:23 +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 339LZNSX081665; Sun, 9 Apr 2023 21:35:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 339LZNks081664; Sun, 9 Apr 2023 21:35:23 GMT (envelope-from git) Date: Sun, 9 Apr 2023 21:35:23 GMT Message-Id: <202304092135.339LZNks081664@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: cb80698e4c85 - stable/13 - Reapply: : Avoid instantiating a pointer type in std::decay<> 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/13 X-Git-Reftype: branch X-Git-Commit: cb80698e4c850fbe6f13f4f937501c5639ecfca5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=cb80698e4c850fbe6f13f4f937501c5639ecfca5 commit cb80698e4c850fbe6f13f4f937501c5639ecfca5 Author: Dimitry Andric AuthorDate: 2023-02-09 09:33:42 +0000 Commit: Dimitry Andric CommitDate: 2023-04-09 14:54:53 +0000 Reapply: : Avoid instantiating a pointer type in std::decay<> GCC expands the pointer type in this conditional expression even for template types _Up that are not arrays. This raises an error when std::decay<> is used with reference types (as is done in LLVM's sources). Using add_pointer<> causes GCC to only instantiate a pointer type for array types. A similar change to this commit (albeit reworked due to upstream changes) has been merged to libc++ in commit 26068c6e60324ed866a1ca2afb5cb5eb0aaf015b. In file included from /usr/obj/usr/src/amd64.amd64/tmp/usr/include/c++/v1/__compare/ordering.h:13, from /usr/obj/usr/src/amd64.amd64/tmp/usr/include/c++/v1/__compare/common_comparison_category.h:12, from /usr/obj/usr/src/amd64.amd64/tmp/usr/include/c++/v1/tuple:168, from /usr/src/contrib/llvm-project/llvm/include/llvm/ADT/DenseMapInfo.h:20, from /usr/src/contrib/llvm-project/llvm/include/llvm/ADT/DenseMap.h:17, from /usr/src/contrib/llvm-project/llvm/lib/Transforms/Scalar/GVNHoist.cpp:36: /usr/obj/usr/src/amd64.amd64/tmp/usr/include/c++/v1/type_traits: In instantiation of 'struct std::__1::__decay': /usr/obj/usr/src/amd64.amd64/tmp/usr/include/c++/v1/type_traits:1591:89: required from 'struct std::__1::decay' /usr/obj/usr/src/amd64.amd64/tmp/usr/include/c++/v1/__utility/pair.h:132:16: required by substitution of 'template::type>::value && (! std::__1::is_same::type, std::__1::pair > >::value)), std::__1::pair >::_CheckTupleLikeConstructor, std::__1::__check_tuple_constructor_fail>::type::__enable_implicit<_Tuple>(), void>::type* > constexpr std::__1::pair >::pair(_Tuple&&) [with _Tuple = llvm::CHIArg&&; typename std::__1::enable_if::type>::value && (! std::__1::is_same::type, std::__1::pair > >::value)), std::__1::pair >::_CheckTupleLikeConstructor, std::__1::__check_tuple_constructor_fail>::type::__enable_implicit<_Tuple>(), void>::type* = ]' /usr/src/contrib/llvm-project/llvm/lib/Transforms/Scalar/GVNHoist.cpp:892:51: required from here /usr/obj/usr/src/amd64.amd64/tmp/usr/include/c++/v1/type_traits:1582:30: error: forming pointer to reference type 'std::__1::remove_extent::type' {aka 'llvm::CHIArg&'} 1582 | >::type type; | ^~~~ Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D36898 This reapplies commit c36de97088a2b9141cdaf2fae2a7f41bf820ffa0, which I accidentally overwrote in the llvm 15 merge. (It turns out upstream did not merge this to their 15.x branch.) MFC after: 2 weeks (cherry picked from commit 4378cc5cfb5cf928e287c0143efb120d5558c4a0) --- contrib/llvm-project/libcxx/include/__type_traits/decay.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/decay.h b/contrib/llvm-project/libcxx/include/__type_traits/decay.h index d47ad03fe008..2af0c1ca42c3 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/decay.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/decay.h @@ -37,7 +37,7 @@ public: typedef _LIBCPP_NODEBUG typename conditional < is_array<_Up>::value, - typename remove_extent<_Up>::type*, + typename add_pointer::type>::type, typename conditional < is_function<_Up>::value,