[libcxx-commits] [libcxx] [libc++] Remove <tuple> include from <__format/concepts.h> (PR #80214)
Nikolas Klauser via libcxx-commits
libcxx-commits at lists.llvm.org
Sat Mar 9 02:52:11 PST 2024
https://github.com/philnik777 updated https://github.com/llvm/llvm-project/pull/80214
>From cb22f598f1a7e82dddfe47e56873804fb1ae468c Mon Sep 17 00:00:00 2001
From: Nikolas Klauser <nikolasklauser at berlin.de>
Date: Thu, 1 Feb 2024 00:20:27 +0100
Subject: [PATCH] [libc++] Remove <tuple> include from <__format/concepts.h>
---
libcxx/include/__format/concepts.h | 4 +++-
libcxx/include/__tuple/tuple_size.h | 7 ++++++-
libcxx/include/chrono | 1 +
libcxx/include/tuple | 3 ---
libcxx/include/vector | 1 +
libcxx/test/libcxx/transitive_includes/cxx23.csv | 2 --
libcxx/test/libcxx/transitive_includes/cxx26.csv | 4 +++-
.../tuple.tuple/tuple.helper/tuple_size_v.verify.cpp | 8 ++++----
8 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/libcxx/include/__format/concepts.h b/libcxx/include/__format/concepts.h
index d7b5a9d16df70a9..13380e9b91aff85 100644
--- a/libcxx/include/__format/concepts.h
+++ b/libcxx/include/__format/concepts.h
@@ -15,10 +15,12 @@
#include <__config>
#include <__format/format_parse_context.h>
#include <__fwd/format.h>
+#include <__fwd/tuple.h>
+#include <__tuple/tuple_size.h>
#include <__type_traits/is_specialization.h>
#include <__type_traits/remove_const.h>
+#include <__type_traits/remove_reference.h>
#include <__utility/pair.h>
-#include <tuple>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/libcxx/include/__tuple/tuple_size.h b/libcxx/include/__tuple/tuple_size.h
index b8320106fb26941..18a17fd4d58780b 100644
--- a/libcxx/include/__tuple/tuple_size.h
+++ b/libcxx/include/__tuple/tuple_size.h
@@ -43,7 +43,7 @@ struct _LIBCPP_TEMPLATE_VIS tuple_size<__enable_if_tuple_size_imp< volatile _Tp,
template <class _Tp>
struct _LIBCPP_TEMPLATE_VIS
- tuple_size<__enable_if_tuple_size_imp< const volatile _Tp, integral_constant<size_t, sizeof(tuple_size<_Tp>)>>>
+tuple_size<__enable_if_tuple_size_imp<const volatile _Tp, integral_constant<size_t, sizeof(tuple_size<_Tp>)>>>
: public integral_constant<size_t, tuple_size<_Tp>::value> {};
#else
@@ -63,6 +63,11 @@ struct _LIBCPP_TEMPLATE_VIS tuple_size<tuple<_Tp...> > : public integral_constan
template <class... _Tp>
struct _LIBCPP_TEMPLATE_VIS tuple_size<__tuple_types<_Tp...> > : public integral_constant<size_t, sizeof...(_Tp)> {};
+# if _LIBCPP_STD_VER >= 17
+template <class _Tp>
+inline constexpr size_t tuple_size_v = tuple_size<_Tp>::value;
+# endif
+
#endif // _LIBCPP_CXX03_LANG
_LIBCPP_END_NAMESPACE_STD
diff --git a/libcxx/include/chrono b/libcxx/include/chrono
index b3b260c2a998e67..0320c1dc4c2f962 100644
--- a/libcxx/include/chrono
+++ b/libcxx/include/chrono
@@ -878,6 +878,7 @@ constexpr chrono::year operator ""y(unsigned lo
# include <cstring>
# include <forward_list>
# include <string>
+# include <tuple>
#endif
#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER == 20
diff --git a/libcxx/include/tuple b/libcxx/include/tuple
index 8808db6739fb9be..1bc84fe510b130d 100644
--- a/libcxx/include/tuple
+++ b/libcxx/include/tuple
@@ -1402,9 +1402,6 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_T1, _T2>::pair(
second(std::forward<_Args2>(std::get<_I2>(__second_args))...) {}
# if _LIBCPP_STD_VER >= 17
-template <class _Tp>
-inline constexpr size_t tuple_size_v = tuple_size<_Tp>::value;
-
# define _LIBCPP_NOEXCEPT_RETURN(...) \
noexcept(noexcept(__VA_ARGS__)) { return __VA_ARGS__; }
diff --git a/libcxx/include/vector b/libcxx/include/vector
index 89cbdf0b3ff7473..90507e6baaf243c 100644
--- a/libcxx/include/vector
+++ b/libcxx/include/vector
@@ -2990,6 +2990,7 @@ _LIBCPP_POP_MACROS
# include <concepts>
# include <cstdlib>
# include <locale>
+# include <tuple>
# include <type_traits>
# include <typeinfo>
# include <utility>
diff --git a/libcxx/test/libcxx/transitive_includes/cxx23.csv b/libcxx/test/libcxx/transitive_includes/cxx23.csv
index 64ff9261820a96b..07f693f514b6310 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx23.csv
+++ b/libcxx/test/libcxx/transitive_includes/cxx23.csv
@@ -85,7 +85,6 @@ chrono sstream
chrono stdexcept
chrono string
chrono string_view
-chrono tuple
chrono vector
chrono version
cinttypes cstdint
@@ -682,6 +681,5 @@ vector new
vector stdexcept
vector string
vector string_view
-vector tuple
vector typeinfo
vector version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx26.csv b/libcxx/test/libcxx/transitive_includes/cxx26.csv
index 64ff9261820a96b..acdef006dde5d83 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx26.csv
+++ b/libcxx/test/libcxx/transitive_includes/cxx26.csv
@@ -85,7 +85,6 @@ chrono sstream
chrono stdexcept
chrono string
chrono string_view
-chrono tuple
chrono vector
chrono version
cinttypes cstdint
@@ -682,6 +681,9 @@ vector new
vector stdexcept
vector string
vector string_view
+<<<<<<< HEAD
vector tuple
vector typeinfo
+=======
+>>>>>>> e10abb864306 ([libc++] Remove <tuple> include from <__format/concepts.h>)
vector version
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_v.verify.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_v.verify.cpp
index 7570230b4b0748b..149890499678d6d 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_v.verify.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_v.verify.cpp
@@ -17,8 +17,8 @@
#include <tuple>
void f() {
- (void)std::tuple_size_v<std::tuple<> &>; // expected-note {{requested here}}
- (void)std::tuple_size_v<int>; // expected-note {{requested here}}
- (void)std::tuple_size_v<std::tuple<>*>; // expected-note {{requested here}}
- // expected-error at tuple:* 3 {{implicit instantiation of undefined template}}
+ (void)std::tuple_size_v<std::tuple<>&>; // expected-note {{requested here}}
+ (void)std::tuple_size_v<int>; // expected-note {{requested here}}
+ (void)std::tuple_size_v<std::tuple<>*>; // expected-note {{requested here}}
+ // expected-error@*:* 3 {{implicit instantiation of undefined template}}
}
More information about the libcxx-commits
mailing list