Cleanup + FTM

Author: H-G-Hristov

libcxx/docs/FeatureTestMacroTable.rst

@@ -336,6 +336,8 @@ Status
     ---------------------------------------------------------- -----------------
     ``__cpp_lib_ios_noreplace``                                ``202207L``
     ---------------------------------------------------------- -----------------
+    ``__cpp_lib_is_implicit_lifetime``                         ``202302L``
+    ---------------------------------------------------------- -----------------
     ``__cpp_lib_is_scoped_enum``                               ``202011L``
     ---------------------------------------------------------- -----------------
     ``__cpp_lib_mdspan``                                       ``202207L``

libcxx/docs/ReleaseNotes/20.rst

@@ -41,6 +41,7 @@ Implemented Papers
 - P2747R2: ``constexpr`` placement new (`Github <https://github.com/llvm/llvm-project/issues/105427>`__)
 - P2609R3: Relaxing Ranges Just A Smidge (`Github <https://github.com/llvm/llvm-project/issues/105253>`__)
 - P2985R0: A type trait for detecting virtual base classes (`Github <https://github.com/llvm/llvm-project/issues/105432>`__)
+- P2674R1: A trait for implicit lifetime types (`Github <https://github.com/llvm/llvm-project/issues/105259>`__)
 
 
 Improvements and New Features

libcxx/docs/Status/Cxx23Papers.csv

@@ -113,7 +113,7 @@
 "`P2572R1 <https://wg21.link/P2572R1>`__","``std::format`` fill character allowances","2023-02 (Issaquah)","|Complete|","17.0",""
 "`P2693R1 <https://wg21.link/P2693R1>`__","Formatting ``thread::id`` and ``stacktrace``","2023-02 (Issaquah)","|Partial|","","The formatter for ``stacktrace`` is not implemented, since ``stacktrace`` is not implemented yet"
 "`P2679R2 <https://wg21.link/P2679R2>`__","Fixing ``std::start_lifetime_as`` for arrays","2023-02 (Issaquah)","","",""
-"`P2674R1 <https://wg21.link/P2674R1>`__","A trait for implicit lifetime types","2023-02 (Issaquah)","","",""
+"`P2674R1 <https://wg21.link/P2674R1>`__","A trait for implicit lifetime types","2023-02 (Issaquah)","|Complete|","20.0",""
 "`P2655R3 <https://wg21.link/P2655R3>`__","``common_reference_t`` of ``reference_wrapper`` Should Be a Reference Type","2023-02 (Issaquah)","","",""
 "`P2652R2 <https://wg21.link/P2652R2>`__","Disallow User Specialization of ``allocator_traits``","2023-02 (Issaquah)","|Complete|","19.0",""
 "`P2787R1 <https://wg21.link/P2787R1>`__","``pmr::generator`` - Promise Types are not Values","2023-02 (Issaquah)","","",""

libcxx/include/__type_traits/is_implicit_lifetime.h

@@ -27,21 +27,6 @@ struct _LIBCPP_TEMPLATE_VIS is_implicit_lifetime : public bool_constant<__builti
 template <class _Tp>
 inline constexpr bool is_implicit_lifetime_v = __builtin_is_implicit_lifetime(_Tp);
 
-#  else
-
-template <typename _Tp>
-struct is_implicit_lifetime
-    : std::disjunction< std::is_scalar<_Tp>,
-                        std::is_array<_Tp>,
-                        std::is_aggregate<_Tp>,
-                        std::conjunction< std::is_trivially_destructible<_Tp>,
-                                          std::disjunction< std::is_trivially_default_constructible<_Tp>,
-                                                            std::is_trivially_copy_constructible<_Tp>,
-                                                            std::is_trivially_move_constructible<_Tp>>>> {};
-
-template <class _Tp>
-inline constexpr bool is_implicit_lifetime_v = is_implicit_lifetime<_Tp>::value;
-
 #  endif
 #endif
 

libcxx/include/module.modulemap

@@ -1944,6 +1944,7 @@ module std_private_type_traits_is_final                                  [system
 module std_private_type_traits_is_floating_point                         [system] { header "__type_traits/is_floating_point.h" }
 module std_private_type_traits_is_function                               [system] { header "__type_traits/is_function.h" }
 module std_private_type_traits_is_fundamental                            [system] { header "__type_traits/is_fundamental.h" }
+module std_private_type_traits_is_implicit_lifetime                      [system] { header "__type_traits/is_implicit_lifetime.h" }
 module std_private_type_traits_is_implicitly_default_constructible       [system] {
   header "__type_traits/is_implicitly_default_constructible.h"
   export std_private_type_traits_integral_constant

libcxx/include/version

@@ -138,6 +138,7 @@ __cpp_lib_ios_noreplace                                 202207L <ios>
 __cpp_lib_is_aggregate                                  201703L <type_traits>
 __cpp_lib_is_constant_evaluated                         201811L <type_traits>
 __cpp_lib_is_final                                      201402L <type_traits>
+__cpp_lib_is_implicit_lifetime                          202302L <type_traits>
 __cpp_lib_is_invocable                                  201703L <type_traits>
 __cpp_lib_is_layout_compatible                          201907L <type_traits>
 __cpp_lib_is_nothrow_convertible                        201806L <type_traits>
@@ -473,6 +474,9 @@ __cpp_lib_void_t                                        201411L <type_traits>
 # define __cpp_lib_forward_like                         202207L
 # define __cpp_lib_invoke_r                             202106L
 # define __cpp_lib_ios_noreplace                        202207L
+# if __has_builtin(__builtin_is_implicit_lifetime)
+#   define __cpp_lib_is_implicit_lifetime               202302L
+# endif
 # define __cpp_lib_is_scoped_enum                       202011L
 # define __cpp_lib_mdspan                               202207L
 # define __cpp_lib_modules                              202207L

libcxx/modules/std/type_traits.inc

@@ -98,7 +98,9 @@ export namespace std {
 
   using std::is_nothrow_destructible;
 
-  //  using std::is_implicit_lifetime;
+#if _LIBCPP_STD_VER >= 23 && __has_builtin(__builtin_is_implicit_lifetime)
+  using std::is_implicit_lifetime;
+#endif
 
   using std::has_virtual_destructor;
 
@@ -243,7 +245,9 @@ export namespace std {
   using std::is_destructible_v;
   using std::is_empty_v;
   using std::is_final_v;
-  // using std::is_implicit_lifetime_v;
+#if _LIBCPP_STD_VER >= 23 && __has_builtin(__builtin_is_implicit_lifetime)
+  using std::is_implicit_lifetime_v;
+#endif
   using std::is_move_assignable_v;
   using std::is_move_constructible_v;
   using std::is_nothrow_assignable_v;

libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.compile.pass.cpp

@@ -23,6 +23,7 @@
     __cpp_lib_is_aggregate                         201703L [C++17]
     __cpp_lib_is_constant_evaluated                201811L [C++20]
     __cpp_lib_is_final                             201402L [C++14]
+    __cpp_lib_is_implicit_lifetime                 202302L [C++23]
     __cpp_lib_is_invocable                         201703L [C++17]
     __cpp_lib_is_layout_compatible                 201907L [C++20]
     __cpp_lib_is_nothrow_convertible               201806L [C++20]
@@ -75,6 +76,10 @@
 #   error "__cpp_lib_is_final should not be defined before c++14"
 # endif
 
+# ifdef __cpp_lib_is_implicit_lifetime
+#   error "__cpp_lib_is_implicit_lifetime should not be defined before c++23"
+# endif
+
 # ifdef __cpp_lib_is_invocable
 #   error "__cpp_lib_is_invocable should not be defined before c++17"
 # endif
@@ -179,6 +184,10 @@
 #   error "__cpp_lib_is_final should have the value 201402L in c++14"
 # endif
 
+# ifdef __cpp_lib_is_implicit_lifetime
+#   error "__cpp_lib_is_implicit_lifetime should not be defined before c++23"
+# endif
+
 # ifdef __cpp_lib_is_invocable
 #   error "__cpp_lib_is_invocable should not be defined before c++17"
 # endif
@@ -301,6 +310,10 @@
 #   error "__cpp_lib_is_final should have the value 201402L in c++17"
 # endif
 
+# ifdef __cpp_lib_is_implicit_lifetime
+#   error "__cpp_lib_is_implicit_lifetime should not be defined before c++23"
+# endif
+
 # ifndef __cpp_lib_is_invocable
 #   error "__cpp_lib_is_invocable should be defined in c++17"
 # endif
@@ -444,6 +457,10 @@
 #   error "__cpp_lib_is_final should have the value 201402L in c++20"
 # endif
 
+# ifdef __cpp_lib_is_implicit_lifetime
+#   error "__cpp_lib_is_implicit_lifetime should not be defined before c++23"
+# endif
+
 # ifndef __cpp_lib_is_invocable
 #   error "__cpp_lib_is_invocable should be defined in c++20"
 # endif
@@ -614,6 +631,19 @@
 #   error "__cpp_lib_is_final should have the value 201402L in c++23"
 # endif
 
+# if __has_builtin(__builtin_is_implicit_lifetime)
+#   ifndef __cpp_lib_is_implicit_lifetime
+#     error "__cpp_lib_is_implicit_lifetime should be defined in c++23"
+#   endif
+#   if __cpp_lib_is_implicit_lifetime != 202302L
+#     error "__cpp_lib_is_implicit_lifetime should have the value 202302L in c++23"
+#   endif
+# else
+#   ifdef __cpp_lib_is_implicit_lifetime
+#     error "__cpp_lib_is_implicit_lifetime should not be defined when the requirement '__has_builtin(__builtin_is_implicit_lifetime)' is not met!"
+#   endif
+# endif
+
 # ifndef __cpp_lib_is_invocable
 #   error "__cpp_lib_is_invocable should be defined in c++23"
 # endif
@@ -796,6 +826,19 @@
 #   error "__cpp_lib_is_final should have the value 201402L in c++26"
 # endif
 
+# if __has_builtin(__builtin_is_implicit_lifetime)
+#   ifndef __cpp_lib_is_implicit_lifetime
+#     error "__cpp_lib_is_implicit_lifetime should be defined in c++26"
+#   endif
+#   if __cpp_lib_is_implicit_lifetime != 202302L
+#     error "__cpp_lib_is_implicit_lifetime should have the value 202302L in c++26"
+#   endif
+# else
+#   ifdef __cpp_lib_is_implicit_lifetime
+#     error "__cpp_lib_is_implicit_lifetime should not be defined when the requirement '__has_builtin(__builtin_is_implicit_lifetime)' is not met!"
+#   endif
+# endif
+
 # ifndef __cpp_lib_is_invocable
 #   error "__cpp_lib_is_invocable should be defined in c++26"
 # endif

libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp

@@ -125,6 +125,7 @@
     __cpp_lib_is_aggregate                                  201703L [C++17]
     __cpp_lib_is_constant_evaluated                         201811L [C++20]
     __cpp_lib_is_final                                      201402L [C++14]
+    __cpp_lib_is_implicit_lifetime                          202302L [C++23]
     __cpp_lib_is_invocable                                  201703L [C++17]
     __cpp_lib_is_layout_compatible                          201907L [C++20]
     __cpp_lib_is_nothrow_convertible                        201806L [C++20]
@@ -671,6 +672,10 @@
 #   error "__cpp_lib_is_final should not be defined before c++14"
 # endif
 
+# ifdef __cpp_lib_is_implicit_lifetime
+#   error "__cpp_lib_is_implicit_lifetime should not be defined before c++23"
+# endif
+
 # ifdef __cpp_lib_is_invocable
 #   error "__cpp_lib_is_invocable should not be defined before c++17"
 # endif
@@ -1550,6 +1555,10 @@
 #   error "__cpp_lib_is_final should have the value 201402L in c++14"
 # endif
 
+# ifdef __cpp_lib_is_implicit_lifetime
+#   error "__cpp_lib_is_implicit_lifetime should not be defined before c++23"
+# endif
+
 # ifdef __cpp_lib_is_invocable
 #   error "__cpp_lib_is_invocable should not be defined before c++17"
 # endif
@@ -2564,6 +2573,10 @@
 #   error "__cpp_lib_is_final should have the value 201402L in c++17"
 # endif
 
+# ifdef __cpp_lib_is_implicit_lifetime
+#   error "__cpp_lib_is_implicit_lifetime should not be defined before c++23"
+# endif
+
 # ifndef __cpp_lib_is_invocable
 #   error "__cpp_lib_is_invocable should be defined in c++17"
 # endif
@@ -3842,6 +3855,10 @@
 #   error "__cpp_lib_is_final should have the value 201402L in c++20"
 # endif
 
+# ifdef __cpp_lib_is_implicit_lifetime
+#   error "__cpp_lib_is_implicit_lifetime should not be defined before c++23"
+# endif
+
 # ifndef __cpp_lib_is_invocable
 #   error "__cpp_lib_is_invocable should be defined in c++20"
 # endif
@@ -5306,6 +5323,19 @@
 #   error "__cpp_lib_is_final should have the value 201402L in c++23"
 # endif
 
+# if __has_builtin(__builtin_is_implicit_lifetime)
+#   ifndef __cpp_lib_is_implicit_lifetime
+#     error "__cpp_lib_is_implicit_lifetime should be defined in c++23"
+#   endif
+#   if __cpp_lib_is_implicit_lifetime != 202302L
+#     error "__cpp_lib_is_implicit_lifetime should have the value 202302L in c++23"
+#   endif
+# else
+#   ifdef __cpp_lib_is_implicit_lifetime
+#     error "__cpp_lib_is_implicit_lifetime should not be defined when the requirement '__has_builtin(__builtin_is_implicit_lifetime)' is not met!"
+#   endif
+# endif
+
 # ifndef __cpp_lib_is_invocable
 #   error "__cpp_lib_is_invocable should be defined in c++23"
 # endif
@@ -7112,6 +7142,19 @@
 #   error "__cpp_lib_is_final should have the value 201402L in c++26"
 # endif
 
+# if __has_builtin(__builtin_is_implicit_lifetime)
+#   ifndef __cpp_lib_is_implicit_lifetime
+#     error "__cpp_lib_is_implicit_lifetime should be defined in c++26"
+#   endif
+#   if __cpp_lib_is_implicit_lifetime != 202302L
+#     error "__cpp_lib_is_implicit_lifetime should have the value 202302L in c++26"
+#   endif
+# else
+#   ifdef __cpp_lib_is_implicit_lifetime
+#     error "__cpp_lib_is_implicit_lifetime should not be defined when the requirement '__has_builtin(__builtin_is_implicit_lifetime)' is not met!"
+#   endif
+# endif
+
 # ifndef __cpp_lib_is_invocable
 #   error "__cpp_lib_is_invocable should be defined in c++26"
 # endif

libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_implicit_lifetime.pass.cpp

@@ -8,6 +8,9 @@
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
 
+// These compilers don't support __builtin_is_implicit_lifetime yet.
+// UNSUPPORTED: clang-17, clang-18, clang-19, gcc-14, apple-clang-16, apple-clang-17
+
 // <type_traits>
 
 // template<class T> struct is_implicit_lifetime;
@@ -106,10 +109,8 @@ struct StructWithZeroSizedArray {
 };
 
 #ifdef TEST_COMPILER_CLANG
-// typedef int *align_value_int __attribute__((align_value(16)));
 using AlignValueInt = int* __attribute__((align_value(16)));
-// typedef float float4 __attribute__((ext_vector_type(4)));
-using Float4 = float __attribute__((ext_vector_type(4)));
+using Float4        = float __attribute__((ext_vector_type(4)));
 
 struct [[clang::enforce_read_only_placement]] EnforceReadOnlyPlacement {};
 struct [[clang::type_visibility("hidden")]] TypeVisibility {};
@@ -146,22 +147,6 @@ constexpr void test_is_implicit_lifetime() {
   test_is_implicit_lifetime<T[94], true>();
 }
 
-// #ifdef TEST_COMPILER_CLANG
-// // Test language extensions: attributes
-// template <typename T>
-// constexpr void test_is_implicit_lifetime_with_attributes() {
-//   test_is_implicit_lifetime<T [[clang::annotate_type("category2")]]*, true>();
-//   test_is_implicit_lifetime<T __attribute__((btf_type_tag("user")))*, true>();
-//   static_assert(__builtin_is_implicit_lifetime(int __attribute__((btf_type_tag("user"))) *));
-
-//   test_is_implicit_lifetime<T __attribute__((noderef))*, true>();
-
-//   test_is_implicit_lifetime<T* _Nonnull, true>();
-//   test_is_implicit_lifetime<T* _Null_unspecified, true>();
-//   test_is_implicit_lifetime<T* _Nullable, true>();
-// }
-// #endif // TEST_COMPILER_CLANG
-
 constexpr bool test() {
   // Standard fundamental C++ types
 
@@ -188,14 +173,6 @@ constexpr bool test() {
   test_is_implicit_lifetime<char16_t>();
   test_is_implicit_lifetime<char32_t>();
 
-  // test_is_implicit_lifetime<int, true>();
-  // test_is_implicit_lifetime<int&, false>();
-  // test_is_implicit_lifetime<int&&, false>();
-
-  // test_is_implicit_lifetime<int*, true>();
-  // test_is_implicit_lifetime<int[], true>();
-  // test_is_implicit_lifetime<int[0], true>();
-  // test_is_implicit_lifetime<int[94], true>();
   test_is_implicit_lifetime<short>();
   test_is_implicit_lifetime<short int>();
   test_is_implicit_lifetime<signed short>();
@@ -238,12 +215,6 @@ constexpr bool test() {
   test_is_implicit_lifetime<void (&)(), false>();
   test_is_implicit_lifetime<void (*)(), true>();
 
-  // test_is_implicit_lifetime<int UserDeclaredDestructor::*, true>();
-  // test_is_implicit_lifetime<int (UserDeclaredDestructor::*)(), true>();
-  // test_is_implicit_lifetime<int (UserDeclaredDestructor::*)() const, true>();
-  // test_is_implicit_lifetime<int (UserDeclaredDestructor::*)()&, true>();
-  // test_is_implicit_lifetime<int (UserDeclaredDestructor::*)()&&, true>();
-
   // Implicit-lifetime class types
 
   test_is_implicit_lifetime<EmptyStruct>();
@@ -301,10 +272,6 @@ constexpr bool test() {
   test_is_implicit_lifetime<_Complex double>();
   test_is_implicit_lifetime<_Complex long double>();
 
-  // test_is_implicit_lifetime<_Imaginary float>();
-  // test_is_implicit_lifetime<_Imaginary double>();
-  // test_is_implicit_lifetime<_Imaginary long double>();
-
   // Standard C23 types
 
 #ifdef TEST_COMPILER_CLANG
@@ -319,9 +286,6 @@ constexpr bool test() {
   test_is_implicit_lifetime<__uint128_t>();
 #endif
 
-  // #if  __STDC_VERSION__ >= 20
-  // #endif
-
 #ifdef TEST_COMPILER_CLANG
   // https://clang.llvm.org/docs/LanguageExtensions.html#half-precision-floating-point
   test_is_implicit_lifetime<__fp16>();
@@ -337,9 +301,6 @@ constexpr bool test() {
   test_is_implicit_lifetime<EnforceReadOnlyPlacement, true>();
   test_is_implicit_lifetime<TypeVisibility, true>();
 
-  // test_is_implicit_lifetime_with_attributes<int>();
-  // test_is_implicit_lifetime_with_attributes<float>();
-
   test_is_implicit_lifetime<int [[clang::annotate_type("category2")]]*, true>();
   test_is_implicit_lifetime<int __attribute__((btf_type_tag("user")))*, true>();