[libc++] Granularize <type_traits> includes in <utility>
Reviewed By: Mordante, #libc
Spies: libcxx-commits
Differential Revision: https://reviews.llvm.org/D140426
GitOrigin-RevId: 947dfc95ca914385c181f24bbc1a16143c17b5f0
diff --git a/include/__compare/common_comparison_category.h b/include/__compare/common_comparison_category.h
index deab171..d555058 100644
--- a/include/__compare/common_comparison_category.h
+++ b/include/__compare/common_comparison_category.h
@@ -11,7 +11,8 @@
#include <__compare/ordering.h>
#include <__config>
-#include <type_traits>
+#include <__type_traits/is_same.h>
+#include <cstddef>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/__compare/ordering.h b/include/__compare/ordering.h
index ab35a59..ff148ab 100644
--- a/include/__compare/ordering.h
+++ b/include/__compare/ordering.h
@@ -10,7 +10,8 @@
#define _LIBCPP___COMPARE_ORDERING_H
#include <__config>
-#include <type_traits>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_same.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/__compare/three_way_comparable.h b/include/__compare/three_way_comparable.h
index cab2cb2..6c98916 100644
--- a/include/__compare/three_way_comparable.h
+++ b/include/__compare/three_way_comparable.h
@@ -16,8 +16,8 @@
#include <__concepts/same_as.h>
#include <__concepts/totally_ordered.h>
#include <__config>
+#include <__type_traits/common_reference.h>
#include <__type_traits/make_const_lvalue_ref.h>
-#include <type_traits>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/__functional/unwrap_ref.h b/include/__functional/unwrap_ref.h
index f720793..da000d8 100644
--- a/include/__functional/unwrap_ref.h
+++ b/include/__functional/unwrap_ref.h
@@ -10,6 +10,7 @@
#define _LIBCPP___FUNCTIONAL_UNWRAP_REF_H
#include <__config>
+#include <__type_traits/decay.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/__utility/as_const.h b/include/__utility/as_const.h
index e28d7bc..d4a72f4 100644
--- a/include/__utility/as_const.h
+++ b/include/__utility/as_const.h
@@ -10,9 +10,9 @@
#define _LIBCPP___UTILITY_AS_CONST_H
#include <__config>
+#include <__type_traits/add_const.h>
#include <__utility/forward.h>
#include <__utility/move.h>
-#include <type_traits>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/__utility/auto_cast.h b/include/__utility/auto_cast.h
index e907944..381ed0c 100644
--- a/include/__utility/auto_cast.h
+++ b/include/__utility/auto_cast.h
@@ -11,7 +11,7 @@
#define _LIBCPP___UTILITY_AUTO_CAST_H
#include <__config>
-#include <type_traits>
+#include <__type_traits/decay.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/__utility/cmp.h b/include/__utility/cmp.h
index 3cfd981..d448a1d 100644
--- a/include/__utility/cmp.h
+++ b/include/__utility/cmp.h
@@ -10,10 +10,14 @@
#define _LIBCPP___UTILITY_CMP_H
#include <__config>
+#include <__type_traits/disjunction.h>
+#include <__type_traits/is_integral.h>
+#include <__type_traits/is_same.h>
+#include <__type_traits/is_signed.h>
+#include <__type_traits/make_unsigned.h>
#include <__utility/forward.h>
#include <__utility/move.h>
#include <limits>
-#include <type_traits>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/__utility/exchange.h b/include/__utility/exchange.h
index 6838fc8..8df71a1 100644
--- a/include/__utility/exchange.h
+++ b/include/__utility/exchange.h
@@ -10,9 +10,10 @@
#define _LIBCPP___UTILITY_EXCHANGE_H
#include <__config>
+#include <__type_traits/is_nothrow_assignable.h>
+#include <__type_traits/is_nothrow_move_constructible.h>
#include <__utility/forward.h>
#include <__utility/move.h>
-#include <type_traits>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/__utility/in_place.h b/include/__utility/in_place.h
index bedd9e1..a351845 100644
--- a/include/__utility/in_place.h
+++ b/include/__utility/in_place.h
@@ -10,7 +10,8 @@
#define _LIBCPP___UTILITY_IN_PLACE_H
#include <__config>
-#include <type_traits>
+#include <__type_traits/remove_cvref.h>
+#include <cstddef>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/__utility/integer_sequence.h b/include/__utility/integer_sequence.h
index 9ba9d94..257b430 100644
--- a/include/__utility/integer_sequence.h
+++ b/include/__utility/integer_sequence.h
@@ -10,7 +10,8 @@
#define _LIBCPP___UTILITY_INTEGER_SEQUENCE_H
#include <__config>
-#include <type_traits>
+#include <__type_traits/is_integral.h>
+#include <cstddef>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/__utility/move.h b/include/__utility/move.h
index 5226730..2ffcba2 100644
--- a/include/__utility/move.h
+++ b/include/__utility/move.h
@@ -11,7 +11,10 @@
#define _LIBCPP___UTILITY_MOVE_H
#include <__config>
-#include <type_traits>
+#include <__type_traits/conditional.h>
+#include <__type_traits/is_copy_constructible.h>
+#include <__type_traits/is_nothrow_move_constructible.h>
+#include <__type_traits/remove_reference.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/__utility/pair.h b/include/__utility/pair.h
index e183298..8151674 100644
--- a/include/__utility/pair.h
+++ b/include/__utility/pair.h
@@ -19,12 +19,29 @@
#include <__tuple_dir/tuple_element.h>
#include <__tuple_dir/tuple_indices.h>
#include <__tuple_dir/tuple_size.h>
+#include <__type_traits/common_reference.h>
+#include <__type_traits/common_type.h>
+#include <__type_traits/conditional.h>
+#include <__type_traits/is_assignable.h>
+#include <__type_traits/is_constructible.h>
+#include <__type_traits/is_convertible.h>
+#include <__type_traits/is_copy_assignable.h>
+#include <__type_traits/is_default_constructible.h>
#include <__type_traits/is_implicitly_default_constructible.h>
+#include <__type_traits/is_move_assignable.h>
+#include <__type_traits/is_nothrow_assignable.h>
+#include <__type_traits/is_nothrow_constructible.h>
+#include <__type_traits/is_nothrow_copy_assignable.h>
+#include <__type_traits/is_nothrow_copy_constructible.h>
+#include <__type_traits/is_nothrow_default_constructible.h>
+#include <__type_traits/is_nothrow_move_assignable.h>
+#include <__type_traits/is_same.h>
+#include <__type_traits/is_swappable.h>
+#include <__type_traits/nat.h>
#include <__utility/forward.h>
#include <__utility/move.h>
#include <__utility/piecewise_construct.h>
#include <cstddef>
-#include <type_traits>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/__utility/rel_ops.h b/include/__utility/rel_ops.h
index 2577e94..5f8d42c 100644
--- a/include/__utility/rel_ops.h
+++ b/include/__utility/rel_ops.h
@@ -10,9 +10,6 @@
#define _LIBCPP___UTILITY_REL_OPS_H
#include <__config>
-#include <__utility/forward.h>
-#include <__utility/move.h>
-#include <type_traits>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/__utility/to_underlying.h b/include/__utility/to_underlying.h
index 3428406..a194d3e 100644
--- a/include/__utility/to_underlying.h
+++ b/include/__utility/to_underlying.h
@@ -11,7 +11,7 @@
#define _LIBCPP___UTILITY_TO_UNDERLYING_H
#include <__config>
-#include <type_traits>
+#include <__type_traits/underlying_type.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/limits b/include/limits
index ee8249f..9f5949e 100644
--- a/include/limits
+++ b/include/limits
@@ -104,7 +104,9 @@
#include <__assert> // all public C++ headers provide the assertion handler
#include <__config>
-#include <type_traits>
+#include <__type_traits/is_arithmetic.h>
+#include <__type_traits/is_signed.h>
+#include <__type_traits/remove_cv.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
@@ -821,4 +823,8 @@
_LIBCPP_POP_MACROS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+# include <type_traits>
+#endif
+
#endif // _LIBCPP_LIMITS
diff --git a/include/module.modulemap.in b/include/module.modulemap.in
index a19a3c4..467f758 100644
--- a/include/module.modulemap.in
+++ b/include/module.modulemap.in
@@ -1387,7 +1387,10 @@
module is_abstract { private header "__type_traits/is_abstract.h" }
module is_aggregate { private header "__type_traits/is_aggregate.h" }
module is_allocator { private header "__type_traits/is_allocator.h" }
- module is_arithmetic { private header "__type_traits/is_arithmetic.h" }
+ module is_arithmetic {
+ private header "__type_traits/is_arithmetic.h"
+ export integral_constant
+ }
module is_array { private header "__type_traits/is_array.h" }
module is_assignable { private header "__type_traits/is_assignable.h" }
module is_base_of { private header "__type_traits/is_base_of.h" }
diff --git a/include/utility b/include/utility
index 3cc7ce5..4de69f7 100644
--- a/include/utility
+++ b/include/utility
@@ -257,7 +257,6 @@
#include <__utility/to_underlying.h>
#include <__utility/transaction.h>
#include <__utility/unreachable.h>
-#include <type_traits>
#include <version>
// standard-mandated includes
@@ -276,6 +275,7 @@
#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
# include <iosfwd>
+# include <type_traits>
#endif
#endif // _LIBCPP_UTILITY
diff --git a/test/libcxx/transitive_includes/cxx03.csv b/test/libcxx/transitive_includes/cxx03.csv
index 4064fb7..f655f14 100644
--- a/test/libcxx/transitive_includes/cxx03.csv
+++ b/test/libcxx/transitive_includes/cxx03.csv
@@ -563,7 +563,6 @@
memory_resource new
memory_resource stdexcept
memory_resource tuple
-memory_resource type_traits
memory_resource version
mutex atomic
mutex concepts
diff --git a/test/libcxx/transitive_includes/cxx11.csv b/test/libcxx/transitive_includes/cxx11.csv
index aa6fc0c..33aa5f8 100644
--- a/test/libcxx/transitive_includes/cxx11.csv
+++ b/test/libcxx/transitive_includes/cxx11.csv
@@ -563,7 +563,6 @@
memory_resource new
memory_resource stdexcept
memory_resource tuple
-memory_resource type_traits
memory_resource version
mutex atomic
mutex concepts
diff --git a/test/libcxx/transitive_includes/cxx14.csv b/test/libcxx/transitive_includes/cxx14.csv
index e2ef4a2..f557140 100644
--- a/test/libcxx/transitive_includes/cxx14.csv
+++ b/test/libcxx/transitive_includes/cxx14.csv
@@ -565,7 +565,6 @@
memory_resource new
memory_resource stdexcept
memory_resource tuple
-memory_resource type_traits
memory_resource version
mutex atomic
mutex concepts
diff --git a/test/libcxx/transitive_includes/cxx17.csv b/test/libcxx/transitive_includes/cxx17.csv
index e2ef4a2..f557140 100644
--- a/test/libcxx/transitive_includes/cxx17.csv
+++ b/test/libcxx/transitive_includes/cxx17.csv
@@ -565,7 +565,6 @@
memory_resource new
memory_resource stdexcept
memory_resource tuple
-memory_resource type_traits
memory_resource version
mutex atomic
mutex concepts
diff --git a/test/libcxx/transitive_includes/cxx20.csv b/test/libcxx/transitive_includes/cxx20.csv
index 91a829a..f2f4c96 100644
--- a/test/libcxx/transitive_includes/cxx20.csv
+++ b/test/libcxx/transitive_includes/cxx20.csv
@@ -576,7 +576,6 @@
memory_resource new
memory_resource stdexcept
memory_resource tuple
-memory_resource type_traits
memory_resource version
mutex atomic
mutex concepts
diff --git a/test/libcxx/transitive_includes/cxx2b.csv b/test/libcxx/transitive_includes/cxx2b.csv
index d2b83e4..084730e 100644
--- a/test/libcxx/transitive_includes/cxx2b.csv
+++ b/test/libcxx/transitive_includes/cxx2b.csv
@@ -122,7 +122,6 @@
complex type_traits
complex version
concepts cstddef
-concepts type_traits
concepts version
condition_variable atomic
condition_variable cstddef
@@ -197,7 +196,6 @@
experimental/iterator cstddef
experimental/iterator iosfwd
experimental/iterator iterator
-experimental/iterator type_traits
experimental/list experimental/memory_resource
experimental/list list
experimental/map experimental/memory_resource
@@ -381,7 +379,6 @@
latch atomic
latch limits
latch version
-limits type_traits
limits version
list compare
list cstddef
@@ -445,7 +442,6 @@
memory_resource new
memory_resource stdexcept
memory_resource tuple
-memory_resource type_traits
memory_resource version
mutex atomic
mutex cstddef
@@ -598,7 +594,6 @@
sstream istream
sstream ostream
sstream string
-sstream type_traits
sstream version
stack compare
stack cstddef
@@ -717,7 +712,6 @@
utility cstdlib
utility initializer_list
utility limits
-utility type_traits
utility version
valarray cmath
valarray cstddef
diff --git a/test/libcxx/utilities/utility/pairs/pairs.pair/U_V.pass.cpp b/test/libcxx/utilities/utility/pairs/pairs.pair/U_V.pass.cpp
index 2ee914b..98363b6 100644
--- a/test/libcxx/utilities/utility/pairs/pairs.pair/U_V.pass.cpp
+++ b/test/libcxx/utilities/utility/pairs/pairs.pair/U_V.pass.cpp
@@ -14,6 +14,7 @@
// template<class U, class V> pair(U&& x, V&& y);
+#include <type_traits>
#include <utility>
#include "test_macros.h"
diff --git a/test/libcxx/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp b/test/libcxx/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp
index ef5711a..c68ed3e 100644
--- a/test/libcxx/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp
+++ b/test/libcxx/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp
@@ -14,11 +14,9 @@
// pair(const T1& x, const T2& y);
+#include <type_traits>
#include <utility>
-#include "test_macros.h"
-
-
struct ExplicitT {
constexpr explicit ExplicitT(int x) : value(x) {}
constexpr explicit ExplicitT(ExplicitT const& o) : value(o.value) {}
diff --git a/test/libcxx/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp b/test/libcxx/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp
index 3b43a4c..497e4f4 100644
--- a/test/libcxx/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp
+++ b/test/libcxx/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp
@@ -14,6 +14,7 @@
// template <class U, class V> EXPLICIT constexpr pair(const pair<U, V>& p);
+#include <type_traits>
#include <utility>
#include "test_macros.h"
diff --git a/test/std/utilities/expected/expected.unexpected/swap/swap.free.pass.cpp b/test/std/utilities/expected/expected.unexpected/swap/swap.free.pass.cpp
index b70400a..ac0fb82 100644
--- a/test/std/utilities/expected/expected.unexpected/swap/swap.free.pass.cpp
+++ b/test/std/utilities/expected/expected.unexpected/swap/swap.free.pass.cpp
@@ -16,6 +16,7 @@
#include <cassert>
#include <concepts>
#include <expected>
+#include <type_traits>
#include <utility>
// test noexcept
diff --git a/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp b/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp
index b8ba988..a4f534e 100644
--- a/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp
+++ b/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp
@@ -25,8 +25,9 @@
// void
// return_temporary_buffer(T* p);
-#include <memory>
#include <cassert>
+#include <cstdint>
+#include <memory>
#include <utility>
#include "test_macros.h"
diff --git a/test/std/utilities/utility/as_const/as_const.pass.cpp b/test/std/utilities/utility/as_const/as_const.pass.cpp
index 76e5fa1..3f0f9d9 100644
--- a/test/std/utilities/utility/as_const/as_const.pass.cpp
+++ b/test/std/utilities/utility/as_const/as_const.pass.cpp
@@ -11,10 +11,9 @@
// template <class T> constexpr add_const<T>& as_const(T& t) noexcept; // C++17
// template <class T> add_const<T>& as_const(const T&&) = delete; // C++17
-#include <utility>
#include <cassert>
-
-#include "test_macros.h"
+#include <type_traits>
+#include <utility>
struct S {int i;};
bool operator==(const S& x, const S& y) { return x.i == y.i; }
diff --git a/test/std/utilities/utility/forward/move_if_noexcept.pass.cpp b/test/std/utilities/utility/forward/move_if_noexcept.pass.cpp
index d3c253e..0ae7340 100644
--- a/test/std/utilities/utility/forward/move_if_noexcept.pass.cpp
+++ b/test/std/utilities/utility/forward/move_if_noexcept.pass.cpp
@@ -19,6 +19,7 @@
// >::type
// move_if_noexcept(T& x);
+#include <type_traits>
#include <utility>
#include "test_macros.h"
diff --git a/test/std/utilities/utility/pairs/pair.astuple/tuple_element.pass.cpp b/test/std/utilities/utility/pairs/pair.astuple/tuple_element.pass.cpp
index 9ff5e0f..ec3d7e4 100644
--- a/test/std/utilities/utility/pairs/pair.astuple/tuple_element.pass.cpp
+++ b/test/std/utilities/utility/pairs/pair.astuple/tuple_element.pass.cpp
@@ -12,10 +12,9 @@
// tuple_element<I, pair<T1, T2> >::type
+#include <type_traits>
#include <utility>
-#include "test_macros.h"
-
template <class T1, class T2>
void test()
{
diff --git a/test/std/utilities/utility/pairs/pairs.pair/move_ctor.pass.cpp b/test/std/utilities/utility/pairs/pairs.pair/move_ctor.pass.cpp
index e7f19dd..7133310 100644
--- a/test/std/utilities/utility/pairs/pairs.pair/move_ctor.pass.cpp
+++ b/test/std/utilities/utility/pairs/pairs.pair/move_ctor.pass.cpp
@@ -14,9 +14,10 @@
// pair(pair&&) = default;
-#include <utility>
-#include <memory>
#include <cassert>
+#include <memory>
+#include <type_traits>
+#include <utility>
#include "test_macros.h"
diff --git a/test/std/utilities/utility/pairs/pairs.pair/trivial_copy_move.pass.cpp b/test/std/utilities/utility/pairs/pairs.pair/trivial_copy_move.pass.cpp
index be7c0a8..27a912f 100644
--- a/test/std/utilities/utility/pairs/pairs.pair/trivial_copy_move.pass.cpp
+++ b/test/std/utilities/utility/pairs/pairs.pair/trivial_copy_move.pass.cpp
@@ -13,8 +13,9 @@
// pair(pair const&) = default;
// pair(pair&&) = default;
-#include <utility>
#include <cassert>
+#include <type_traits>
+#include <utility>
#include "test_macros.h"
diff --git a/test/std/utilities/utility/pairs/pairs.spec/non_member_const_swap.pass.cpp b/test/std/utilities/utility/pairs/pairs.spec/non_member_const_swap.pass.cpp
index c259afa..8610cfb 100644
--- a/test/std/utilities/utility/pairs/pairs.spec/non_member_const_swap.pass.cpp
+++ b/test/std/utilities/utility/pairs/pairs.spec/non_member_const_swap.pass.cpp
@@ -14,6 +14,7 @@
// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
#include <cassert>
+#include <type_traits>
#include <utility>
#include "test_macros.h"
diff --git a/test/std/utilities/utility/utility.inplace/inplace.pass.cpp b/test/std/utilities/utility/utility.inplace/inplace.pass.cpp
index 007c7a5..8a1afe2 100644
--- a/test/std/utilities/utility/utility.inplace/inplace.pass.cpp
+++ b/test/std/utilities/utility/utility.inplace/inplace.pass.cpp
@@ -29,11 +29,10 @@
// template <size_t I>
// inline constexpr in_place_index_t<I> in_place_index{};
-#include <utility>
#include <cassert>
#include <memory>
-
-#include "test_macros.h"
+#include <type_traits>
+#include <utility>
template <class Tp, class Up>
constexpr bool check_tag(Up) {
