[libcxx-commits] [libcxx] [libcxxabi] [libc++] Remove dependence on <ciso646> (PR #73271)

[Michael Kenzel via libcxx-commits]

https://github.com/michael-kenzel created https://github.com/llvm/llvm-project/pull/73271

C++23 removed `<ciso646>` from the standard library. The header is used in a few places in order to pull in implementation-specific and feature test macros. The new way of doing that is `<version>`, which should be supported by all supported implementations. This change replaces all those uses of `<ciso646>` with `<version>`.

>From b00fa66562c381a2c2cd4d104aceed7e6131d890 Mon Sep 17 00:00:00 2001
From: Michael Kenzel <michael.kenzel at gmail.com>
Date: Sat, 11 Nov 2023 23:31:25 +0100
Subject: [PATCH] [libc++] Remove dependence on <ciso646>

---
 libcxx/test/support/container_debug_tests.h | 2 +-
 libcxx/test/support/test_macros.h           | 4 ++--
 libcxxabi/src/demangle/DemangleConfig.h     | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/libcxx/test/support/container_debug_tests.h b/libcxx/test/support/container_debug_tests.h
index c35da37a87da6eb..2f43daeaac060b8 100644
--- a/libcxx/test/support/container_debug_tests.h
+++ b/libcxx/test/support/container_debug_tests.h
@@ -9,7 +9,7 @@
 #ifndef TEST_SUPPORT_CONTAINER_DEBUG_TESTS_H
 #define TEST_SUPPORT_CONTAINER_DEBUG_TESTS_H
 
-#include <ciso646>
+#include <version>
 #ifndef _LIBCPP_VERSION
 #error This header may only be used for libc++ tests
 #endif
diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h
index e549ec2ca7a1a71..f466cecbfcbffcd 100644
--- a/libcxx/test/support/test_macros.h
+++ b/libcxx/test/support/test_macros.h
@@ -12,7 +12,7 @@
 
 // Attempt to get STL specific macros like _LIBCPP_VERSION using the most
 // minimal header possible. If we're testing libc++, we should use `<__config>`.
-// If <__config> isn't available, fall back to <ciso646>.
+// If <__config> isn't available, fall back to <version>.
 #ifdef __has_include
 # if __has_include("<__config>")
 #   include <__config>
@@ -20,7 +20,7 @@
 # endif
 #endif
 #ifndef TEST_IMP_INCLUDED_HEADER
-#include <ciso646>
+#include <version>
 #endif
 
 #define TEST_STRINGIZE_IMPL(...) #__VA_ARGS__
diff --git a/libcxxabi/src/demangle/DemangleConfig.h b/libcxxabi/src/demangle/DemangleConfig.h
index dec382d0d38f8ef..57dcd04ed7b7814 100644
--- a/libcxxabi/src/demangle/DemangleConfig.h
+++ b/libcxxabi/src/demangle/DemangleConfig.h
@@ -19,8 +19,6 @@
 #include "../abort_message.h"
 #endif
 
-#include <ciso646>
-
 #ifdef _MSC_VER
 // snprintf is implemented in VS 2015
 #if _MSC_VER < 1900