[libcxx-commits] [libcxx] 9e618e5 - [libc++][NFC] Remove a few unused macros from <__config>

[Nikolas Klauser via libcxx-commits]

Author: Nikolas Klauser
Date: 2023-11-13T12:57:59+01:00
New Revision: 9e618e5ed4c9f2c24e2c308e7f28e505e788f5fa

URL: https://github.com/llvm/llvm-project/commit/9e618e5ed4c9f2c24e2c308e7f28e505e788f5fa
DIFF: https://github.com/llvm/llvm-project/commit/9e618e5ed4c9f2c24e2c308e7f28e505e788f5fa.diff

LOG: [libc++][NFC] Remove a few unused macros from <__config>

Added: 
    

Modified: 
    libcxx/.clang-format
    libcxx/include/__config
    libcxx/test/support/test_macros.h

Removed: 
    


################################################################################
diff  --git a/libcxx/.clang-format b/libcxx/.clang-format
index 4904374f89bc66c..05d5c473ec79b4d 100644
--- a/libcxx/.clang-format
+++ b/libcxx/.clang-format
@@ -23,7 +23,6 @@ AttributeMacros: [
                   '_LIBCPP_CONSTEXPR_SINCE_CXX20',
                   '_LIBCPP_CONSTEXPR_SINCE_CXX23',
                   '_LIBCPP_CONSTEXPR',
-                  '_LIBCPP_CONSTINIT',
                   '_LIBCPP_DEPRECATED_IN_CXX11',
                   '_LIBCPP_DEPRECATED_IN_CXX14',
                   '_LIBCPP_DEPRECATED_IN_CXX17',
@@ -40,7 +39,6 @@ AttributeMacros: [
                   '_LIBCPP_INLINE_VISIBILITY',
                   '_LIBCPP_INTERNAL_LINKAGE',
                   '_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS',
-                  '_LIBCPP_NO_DESTROY',
                   '_LIBCPP_NO_SANITIZE',
                   '_LIBCPP_NO_UNIQUE_ADDRESS',
                   '_LIBCPP_NOALIAS',

diff  --git a/libcxx/include/__config b/libcxx/include/__config
index 1b30de33e5c4498..6b643e1ca5e23a4 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -1063,12 +1063,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #    define _LIBCPP_NODISCARD_AFTER_CXX17
 #  endif
 
-#  if __has_attribute(__no_destroy__)
-#    define _LIBCPP_NO_DESTROY __attribute__((__no_destroy__))
-#  else
-#    define _LIBCPP_NO_DESTROY
-#  endif
-
 #  ifndef _LIBCPP_HAS_NO_ASAN
     extern "C" _LIBCPP_EXPORTED_FROM_ABI void
     __sanitizer_annotate_contiguous_container(const void*, const void*, const void*, const void*);
@@ -1232,14 +1226,6 @@ __sanitizer_verify_double_ended_contiguous_container(const void*, const void*, c
 #    define _LIBCPP_THREAD_SAFETY_ANNOTATION(x)
 #  endif
 
-#  if _LIBCPP_STD_VER >= 20
-#    define _LIBCPP_CONSTINIT constinit
-#  elif __has_attribute(__require_constant_initialization__)
-#    define _LIBCPP_CONSTINIT __attribute__((__require_constant_initialization__))
-#  else
-#    define _LIBCPP_CONSTINIT
-#  endif
-
 #  if __has_attribute(__diagnose_if__) && !defined(_LIBCPP_DISABLE_ADDITIONAL_DIAGNOSTICS)
 #    define _LIBCPP_DIAGNOSE_WARNING(...) __attribute__((__diagnose_if__(__VA_ARGS__, "warning")))
 #  else
@@ -1398,14 +1384,6 @@ __sanitizer_verify_double_ended_contiguous_container(const void*, const void*, c
 #    define _LIBCPP_GCC_DIAGNOSTIC_IGNORED(str)
 #  endif
 
-#  if defined(_AIX) && !defined(_LIBCPP_COMPILER_GCC)
-#    define _LIBCPP_PACKED_BYTE_FOR_AIX _Pragma("pack(1)")
-#    define _LIBCPP_PACKED_BYTE_FOR_AIX_END _Pragma("pack(pop)")
-#  else
-#    define _LIBCPP_PACKED_BYTE_FOR_AIX     /* empty */
-#    define _LIBCPP_PACKED_BYTE_FOR_AIX_END /* empty */
-#  endif
-
 #  if __has_attribute(__packed__)
 #    define _LIBCPP_PACKED __attribute__((__packed__))
 #  else

diff  --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h
index 252e82ef0410553..e549ec2ca7a1a71 100644
--- a/libcxx/test/support/test_macros.h
+++ b/libcxx/test/support/test_macros.h
@@ -213,8 +213,6 @@
 
 #if TEST_STD_VER > 17
 #define TEST_CONSTINIT constinit
-#elif defined(_LIBCPP_CONSTINIT)
-#define TEST_CONSTINIT _LIBCPP_CONSTINIT
 #else
 #define TEST_CONSTINIT
 #endif