From a89edd0694b304ee4c08647876d6d3fc4b6eba9d Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Thu, 13 Feb 2025 17:05:22 +0200 Subject: [PATCH 1/3] [libc++][NFC] Add reminder to remove _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER macro `__cpp_explicit_this_parameter` has been set in LLVM20 // https://github.com/llvm/llvm-project/pull/107451 --- libcxx/include/__config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libcxx/include/__config b/libcxx/include/__config index ca6aade34107b..5c8c72fce5921 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -1198,6 +1198,8 @@ typedef __char32_t char32_t; # define _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK # endif +// TODO(LLVM 22): Remove this macro once LLVM19 support ends. __cpp_explicit_this_parameter has been set in LLVM20 +// https://github.com/llvm/llvm-project/pull/107451 // Clang-18 has support for deducing this, but it does not set the FTM. # if defined(__cpp_explicit_this_parameter) || (defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER >= 1800) # define _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER 1 From 7d477f2db7027faec5b81a80dafec4851fa4138b Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Fri, 14 Feb 2025 11:21:11 +0200 Subject: [PATCH 2/3] Update libcxx/include/__config --- libcxx/include/__config | 1 - 1 file changed, 1 deletion(-) diff --git a/libcxx/include/__config b/libcxx/include/__config index 5c8c72fce5921..53fede34d8edf 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -1199,7 +1199,6 @@ typedef __char32_t char32_t; # endif // TODO(LLVM 22): Remove this macro once LLVM19 support ends. __cpp_explicit_this_parameter has been set in LLVM20 -// https://github.com/llvm/llvm-project/pull/107451 // Clang-18 has support for deducing this, but it does not set the FTM. # if defined(__cpp_explicit_this_parameter) || (defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER >= 1800) # define _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER 1 From 024be0686c2c8e4f847a2ecf23533e85c0f24f23 Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Fri, 14 Feb 2025 11:22:16 +0200 Subject: [PATCH 3/3] Update libcxx/include/__config --- libcxx/include/__config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcxx/include/__config b/libcxx/include/__config index 53fede34d8edf..c16552228dbb1 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -1198,7 +1198,7 @@ typedef __char32_t char32_t; # define _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK # endif -// TODO(LLVM 22): Remove this macro once LLVM19 support ends. __cpp_explicit_this_parameter has been set in LLVM20 +// TODO(LLVM 22): Remove this macro once LLVM19 support ends. __cpp_explicit_this_parameter has been set in LLVM20. // Clang-18 has support for deducing this, but it does not set the FTM. # if defined(__cpp_explicit_this_parameter) || (defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER >= 1800) # define _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER 1