From nobody Thu Nov 24 00:12:31 2022 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 4NHdjX0KCFz4hWNZ; Thu, 24 Nov 2022 00:12: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 4NHdjW6ygXz4Gg7; Thu, 24 Nov 2022 00:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669248752; 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=KBLJU8AOengy93RwrI2JVTV4N1nVjiyjUMiOpkUDARI=; b=NZrvaYQiBBYbR83KbAAZTpr7qgtg+59JJFMsM+XaSLJxJqv/SO1p03Mrz/BBGodRqaWL6r qGI5O2IuGAVkExa21L9R6nUn8UHVbGM2IPG+hFfzUAZTq1JgYCTs8/I9MxrVYRN+PUvfuu KBhptHBCsvZ5rVhvD5d5ZH2r1dW43NrGP8/WfmGlPX0pQoc/EaXogebT2Vr5EiHxqDaFwf 9C/lUQa43vv68hrrnHX/KCpDYpbyxn8/R4992WA6PemeLMWi2c4rtSgFeWIb6g9+ca9Fbp 343oB0cFEPLiwC2ikQTbdSMZ6o5moDF64nbkbIMc7NeqVIMcW1aFE3YkZEgQHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669248752; 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=KBLJU8AOengy93RwrI2JVTV4N1nVjiyjUMiOpkUDARI=; b=NRZ/OhG0mlHZEXA1QZWWXXXffLMjQ8cAUuLvFkZclOZFyW7NYrlbjO9Zz7MVTQAQVTy6bP zsLncL1kMMq9TXZoREoTAJN9ae/m8Zfj8EnIqVPQMpeCGkdgR+hnvYKEXoT4FBNjrA2RRu oHel5UGMHFb21/+KTnEI+kXJheWmCTNTxbIPyVQ1Uj6uUecbIbgOtt3EAXuL+9/QRviX+n DOagAalPrpbKvQ6MiSSyn/l8DDVpuGY6x6F9STjbSYNBk/iHgVlIlo5VmA+k/G6sPuSKhL 3rqwe6w3Sjqg0gu6ZYwDhmbWFGjWUDwBMfzs/J04I1pA6RxqeIAHnm0t3Y6K+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669248752; a=rsa-sha256; cv=none; b=YbhJ6SnQz5iW+d6iayjV2DObUm4g3ME/tXu0IGCQHpFWKA5bC2HerhSc2NOQPaSbzSlyyD h9/3TkI/Tsc4kKlX/gNvZneTKJSkj93T47ECGs/9DgcYzrCa4IsrKLEithEdMFXb/eMFER tJnexWhSR9y4+m08fMwRV5978VoVRiG6TQhgge8Iy2a3Fi1GMHxjydkdY2ahSpSjJJJb2M YluvF2++ajSwgS5xAMDeNKgTqE+6jWJvv94DYd6BZL3Oafhm6vMLWs0Jd1yjVBTAbms/5u YmUc3Vjwt6qozkg9Gl9X4i47EDWdCDL4/26OWZX9rJUweJPY5t8SD3owscwsdA== 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 4NHdjW62kpzhR8; Thu, 24 Nov 2022 00:12: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 2AO0CVV4049508; Thu, 24 Nov 2022 00:12:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AO0CVSp049507; Thu, 24 Nov 2022 00:12:31 GMT (envelope-from git) Date: Thu, 24 Nov 2022 00:12:31 GMT Message-Id: <202211240012.2AO0CVSp049507@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c36de97088a2 - main - : Avoid instantiating a pointer type in std::decay<>. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c36de97088a2b9141cdaf2fae2a7f41bf820ffa0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c36de97088a2b9141cdaf2fae2a7f41bf820ffa0 commit c36de97088a2b9141cdaf2fae2a7f41bf820ffa0 Author: John Baldwin AuthorDate: 2022-11-24 00:10:05 +0000 Commit: John Baldwin CommitDate: 2022-11-24 00:10:05 +0000 : 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 --- contrib/llvm-project/libcxx/include/type_traits | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/libcxx/include/type_traits b/contrib/llvm-project/libcxx/include/type_traits index 3391999675a0..daf031e475f7 100644 --- a/contrib/llvm-project/libcxx/include/type_traits +++ b/contrib/llvm-project/libcxx/include/type_traits @@ -1572,7 +1572,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,