From nobody Fri May 05 16:20:04 2023 X-Original-To: dev-commits-src-main@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 4QCbW928cjz49WQ7; Fri, 5 May 2023 16:20:05 +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 4QCbW91RJ6z48b4; Fri, 5 May 2023 16:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683303605; 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=Ce5taeLs1YGMscnKltQYawjzrddIRCO5CiWNBjF00ck=; b=ws6IyJ5mQR2aUg87YalijZoRjlSs8VAtRWgx3MQiHObYEsDgpZcxe7NTRnYN/vsskz7blE n+GKnYM90lYCCHqAr7bw1Sr2ZBVVUptVm96An0VL2wU/BFmeJPQQmp7yi0PFRlUblwT6xf Ep2yP6He2f42xBWegRa+gXWnwke/DinItdMjzZgA/RFD5TQ7tejPo5pdaRWkBLVDttD9Q4 II6eK/y5J/dWZ6mwI4qBlxUysdg1ffjX7NgPVwi6UwVma4/AURoxk8tU/SPe8sMN2Gb5lI YhuiHg8gAFLI7fkoW5wZBaoCopuYr3AE+NN+pY0nSxyBLxOC7+9kCSSJluP9LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683303605; 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=Ce5taeLs1YGMscnKltQYawjzrddIRCO5CiWNBjF00ck=; b=FF/bbzlMb7Dfwls5b5DyqpodN1l01zfVnGsyzOzk0ZBUu/o0NJAr8hZZUnG4TMXXKdjRmW d8EBKUMdbdwTEmqFtizf48rE5dU/49Qx6+VTieHHfUaPzH/t0BdtHzsoZoYLcdGiu2BnmK SJz4eysweh0FHL8sAcItwesNOMCUX48Ig2G1DTSFIzBEd+z73u15oP47XamJt72C5nhlQt NS/eKYKCerS6LgzlVR1+DQmypdU5t67rU/mRjI9LDpUizCwZoJwZ3OExWR2hY+f0WENJFH T+6vnKGaI7JO+2D01geHVSdsPwXKgD7F2OFOftwdqZNtq8Xh2CrRwm7ycZqIYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683303605; a=rsa-sha256; cv=none; b=X7HkfaRDgs5/tR7ajeOkdI5X4EV9YPSU3mNlThOQLuVNvjiJjDGaVBRt+b9hsmBguBLX+y +ENdq5BpRWCG1yZhwR6MUcnHI1JDgwCmcoJlhycdut6EJNTnWQNfaBw/oKwLqyJjW3YeU5 k0Jj4jFSyZrMbhYe+CfDkjAC2605eB3SPsbX7DmweNwfcw/CBDnmtSyu8NVTd7kkvYkumg BKq6Ko6UQ514LSQhVWEdD09bNgH4XMDKYmV7nHu+MzCkXEy1lDz2Ed1BeAnFrg4G4gw6/N ZitrNmjyKBWUu+rEFDYvwyolSfqvcDfHlwlhZm/pVUokDgNZDPkJYaKT2ErCGg== 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 4QCbW90Nvjz11RL; Fri, 5 May 2023 16:20:05 +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 345GK4BD098962; Fri, 5 May 2023 16:20:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 345GK4eD098958; Fri, 5 May 2023 16:20:04 GMT (envelope-from git) Date: Fri, 5 May 2023 16:20:04 GMT Message-Id: <202305051620.345GK4eD098958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 2df58f190731 - main - Apply libc++ fix for compiling with gcc 13 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2df58f190731634be67e90b7c453dee587b4ea27 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2df58f190731634be67e90b7c453dee587b4ea27 commit 2df58f190731634be67e90b7c453dee587b4ea27 Author: Dimitry Andric AuthorDate: 2023-05-05 16:19:40 +0000 Commit: Dimitry Andric CommitDate: 2023-05-05 16:19:40 +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 --- .../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