From nobody Mon May 08 17:00:56 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 4QFSGx14nsz4B7N4; Mon, 8 May 2023 17:00:57 +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 4QFSGx0bNRz3kYZ; Mon, 8 May 2023 17:00:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683565257; 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=2hdaIhdZNkZpI44A/E7K7+fFRfQvuQ7b+tEVxoGP5ms=; b=e7aP6Jnov+fmYCnJHDJMUI7Ttml27LHcUD1Sr2O5ysFRqTPNZ+1AeL+QrEeGe0U2uHoQJ2 1rM7BIS/e5FJ/4SJ8QtA3Gwi8W5sew4gjD6wUZSdwNPT1RvvASieaNy2NMD5LltX6CVmi2 HgAcqM8zBDHzutcLHcLLnB3pOgOjVrW1V53vJa/GQDygeHWtnzXSvJ9cjbxC9alo+dxK6C Jigfw2dqH0R6US5LRbrguIRblnVffNRWgEx9wuuoBuMC/W6IJm9DeCyqL+NZ26cInq8lgQ MTHTAyJw6zLnN/IqI1EF8qytyE7DuSzwAbhni+h9QWKAM6OBx6f9A7vdgRvl/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683565257; 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=2hdaIhdZNkZpI44A/E7K7+fFRfQvuQ7b+tEVxoGP5ms=; b=PtDWY/yELrMvq+X2f/OZHvcHFB7TsGisyFlCcWEBQE2XG7sZrkiLb7MvZLU7vLvpvMVCsF I5e/xBfbv2fC2gVIuWnJFfrZxTLnjRA50T0QGxSE38BARIxTfBv5yA5c3+QLT7X6wLb50Q J2sakQwvFssUd7pyS9SlScE+cY+s6BCQaAkGYqYeZeqg0Xq3Al/HkfoY/yb6PnC2YzX9xT piHsrlz2YJZ0A3KrIGxnnJuTUfgYhiZoZ5NjAD0tq5mXPVR0OmwTe88V8rhLqXcGxmOL9H Mj2HtlOMzPNjuaW1sy0fJlTtMAiR3CbiVc/pn8dfeETnBLgpDzgdoS6yBvgIEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683565257; a=rsa-sha256; cv=none; b=wCm75Bf97S3J0NwtkdczDwI2NRYYPLD6+S6nx3orOtUUWGZdJeA86bAgyde14d8cuMeuxt todFcH4bUu+ys1+wH+oeCnIAyla47KYMYC2OfeOqfsRaBrBSRpRpzkAotqvuVWLj6zIHOm fzMETB6OZFvdzMgoXoMFUOnvA+j63+KsUXCSz2rRXsulf9IEmvUJPg/bpq7wde78VmBVV/ g6JyEmI33OosBvFAXcQDN/FuHvusX+nmr/Ua78eDbYszFDxu1l1BtXryL4pOD1eeFJJTEu IDOFCpotuGdukl0fsCqFkiegCr8VGNO1qngmHCsfpor3SxQQr8VNA+OwXhfAqA== 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 4QFSGw6q5qz175c; Mon, 8 May 2023 17:00:56 +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 348H0uPt002345; Mon, 8 May 2023 17:00:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 348H0uCu002344; Mon, 8 May 2023 17:00:56 GMT (envelope-from git) Date: Mon, 8 May 2023 17:00:56 GMT Message-Id: <202305081700.348H0uCu002344@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: 148ae1880038 - stable/13 - Apply libc++ fix for compiling with gcc 13 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: 148ae1880038c1f349e00484310fbbd79f0a3e87 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=148ae1880038c1f349e00484310fbbd79f0a3e87 commit 148ae1880038c1f349e00484310fbbd79f0a3e87 Author: Dimitry Andric AuthorDate: 2023-05-05 16:19:40 +0000 Commit: Dimitry Andric CommitDate: 2023-05-08 16:53:07 +0000 Apply libc++ fix for compiling with gcc 13 Merge commit 484e64f7e7b2 from llvm-project (by Roland McGrath): [libc++] Use __is_convertible built-in when available https://github.com/llvm/llvm-project/issues/62396 reports that GCC 13 barfs on parsing because of the declarations of `struct __is_convertible`. In GCC 13, `__is_convertible` is a built-in, but `__is_convertible_to` is not. Clang has both, so using either should be fine. Reviewed By: #libc, philnik Differential Revision: https://reviews.llvm.org/D149313 Reported by: Mark Millard MFC after: 3 days (cherry picked from commit 2df58f190731634be67e90b7c453dee587b4ea27) --- .../llvm-project/libcxx/include/__type_traits/is_convertible.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h b/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h index 7e49cd4e6a31..7ce3c38b76de 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h @@ -24,11 +24,18 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__is_convertible_to) && !defined(_LIBCPP_USE_IS_CONVERTIBLE_FALLBACK) +#if __has_builtin(__is_convertible) && !defined(_LIBCPP_USE_IS_CONVERTIBLE_FALLBACK) + +template +struct _LIBCPP_TEMPLATE_VIS is_convertible : public integral_constant {}; + +#elif __has_builtin(__is_convertible_to) && !defined(_LIBCPP_USE_IS_CONVERTIBLE_FALLBACK) template struct _LIBCPP_TEMPLATE_VIS is_convertible : public integral_constant {}; +// TODO: Remove this fallback when GCC < 13 support is no longer required. +// GCC 13 has the __is_convertible built-in. #else // __has_builtin(__is_convertible_to) && !defined(_LIBCPP_USE_IS_CONVERTIBLE_FALLBACK) namespace __is_convertible_imp