This is an archive of the discontinued LLVM Phabricator instance.

Differential D153214

[libc++] Remove the type_traits includes from limits and new
ClosedPublic

Authored by iana on Jun 17 2023, 6:57 PM.

Details

Reviewers
ldionne
Mordante
philnik
Bigcheese
Group Reviewers
Restricted Project
Commits
rG2af6d79c7e38: [libc++] Remove the type_traits includes from limits and new
Summary

type_traits is currently unable to include __type_traits/noexcept_move_assign_container.h, because it would cause several include cycles.

type_traits -> type_traits/noexcept_move_assign_container.h -> memory/allocator_traits.h -> __memory/construct_at.h -> new -> exception -> type_traits

type_traits -> type_traits/noexcept_move_assign_container.h -> memory/allocator_traits.h -> __memory/construct_at.h -> new -> type_traits

type_traits -> type_traits/noexcept_move_assign_container.h -> memory/allocator_traits.h -> limits -> type_traits

This is a problem for clang modules after the std mega module is broken up (D144322), because it becomes a module cycle which is a hard error.

Unconditionally remove the type_traits includes from limits and new in all versions, and also remove the exception include from new. (These are already removed in C++23.)

Diff Detail

Event Timeline

iana created this revision.Jun 17 2023, 6:57 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 17 2023, 6:57 PM
Herald added a subscriber: ributzka. · View Herald Transcript
iana requested review of this revision.Jun 17 2023, 6:57 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 17 2023, 6:57 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
iana added a parent revision: D153213: [libc++][Modules] Add missing submodules.Jun 17 2023, 7:01 PM
iana added a child revision: D153216: [libc++][Modules] Add missing __fwd includes.
Harbormaster completed remote builds in B239643: Diff 532441.Jun 17 2023, 9:03 PM
Mordante requested changes to this revision.Jun 18 2023, 7:55 AM

I've no principle objection against this patch. However this patch feels incomplete since it does not update the transitive includes. I much rather move the patch out of the stack and make it a stand-alone patch; then we can see how it affects the transitive includes.

This revision now requires changes to proceed.Jun 18 2023, 7:55 AM
iana added a comment.Jun 18 2023, 7:28 PM
In D153214#4431127, @Mordante wrote:

I've no principle objection against this patch. However this patch feels incomplete since it does not update the transitive includes. I much rather move the patch out of the stack and make it a stand-alone patch; then we can see how it affects the transitive includes.

I moved it to the front of the stack, and now the transitive include changes show up.

iana updated this revision to Diff 532503.Jun 18 2023, 7:29 PM

Move this change to the front of the stack so that the transitive include modifications show up.

iana removed a parent revision: D153213: [libc++][Modules] Add missing submodules.Jun 18 2023, 7:29 PM
iana added a child revision: D153211: [libc++][Modules] Make module exports consistent with header includes.
iana removed a child revision: D153216: [libc++][Modules] Add missing __fwd includes.Jun 18 2023, 7:57 PM
Harbormaster completed remote builds in B239695: Diff 532503.Jun 18 2023, 9:05 PM
iana added a child revision: D153212: [libc++][Modules] Remove explicit exports from modules that `export *`.Jun 20 2023, 12:47 PM
iana removed a child revision: D153211: [libc++][Modules] Make module exports consistent with header includes.
iana added a child revision: D153211: [libc++][Modules] Make module exports consistent with header includes.Jun 20 2023, 4:07 PM
iana removed a child revision: D153212: [libc++][Modules] Remove explicit exports from modules that `export *`.
ldionne accepted this revision as: ldionne.Jun 21 2023, 12:56 PM

I'm fine with this since it's helpful to make progress on fixing our Clang modules support. It'll hurt a bit, as always, but <new> and <limits> are not the most widely included headers anyways so this might not have such a big impact. In any case, better land this now than closer to the branch date.

Leaving final approval to @Mordante since he had requested changes.

Mordante accepted this revision.Jun 24 2023, 6:02 AM
In D153214#4438872, @ldionne wrote:

I'm fine with this since it's helpful to make progress on fixing our Clang modules support. It'll hurt a bit, as always, but <new> and <limits> are not the most widely included headers anyways so this might not have such a big impact. In any case, better land this now than closer to the branch date.

+1 to landing this sooner than later.

LGTM!

This revision is now accepted and ready to land.Jun 24 2023, 6:02 AM
Closed by commit rG2af6d79c7e38: [libc++] Remove the type_traits includes from limits and new (authored by iana). · Explain WhyJun 24 2023, 10:55 AM
This revision was automatically updated to reflect the committed changes.
iana added a commit: rG2af6d79c7e38: [libc++] Remove the type_traits includes from limits and new.
iana added a child revision: D153828: [libc++] __iterator/readable_traits.h isn't standalone.Jun 26 2023, 9:29 PM
iana removed a child revision: D153211: [libc++][Modules] Make module exports consistent with header includes.
iana added a parent revision: D150503: [libc++][PSTL] Make the PSTL submodules only have one header.
iana added a reverting change: D154747: Revert "[libc++] Remove the type_traits includes from limits and new".Jul 7 2023, 2:15 PM
iana added a reverting change: rG6c47654efd36: Revert "[libc++] Remove the type_traits includes from limits and new".Jul 7 2023, 5:53 PM

Revision Contents

PathSize
libcxx/
docs/
4 lines
include/
4 lines
5 lines
test/
libcxx/
transitive_includes/
6 lines
6 lines
6 lines
6 lines
6 lines

Diff 534238

libcxx/docs/ReleaseNotes.rst

Show First 20 Lines • Show All 77 Lines • ▼ Show 20 Lines- Several incidental transitive includes have been removed from libc++. Those
includes are removed based on the language version used. Incidental transitive includes are removed based on the language version used. Incidental transitive
inclusions of the following headers have been removed: inclusions of the following headers have been removed:
- C++23: ``atomic``, ``bit``, ``cstdint``, ``cstdlib``, ``cstring``, ``initializer_list``, ``limits``, ``new``, - C++23: ``atomic``, ``bit``, ``cstdint``, ``cstdlib``, ``cstring``, ``initializer_list``, ``limits``, ``new``,
``stdexcept``, ``system_error``, ``type_traits``, ``typeinfo`` ``stdexcept``, ``system_error``, ``type_traits``, ``typeinfo``
- ``<algorithm>`` no longer includes ``<chrono>`` in any C++ version (it was previously included in C++17 and earlier). - ``<algorithm>`` no longer includes ``<chrono>`` in any C++ version (it was previously included in C++17 and earlier).
- ``<limits>`` no longer includes ``<type_traits>`` in any C++ version (it was previously included in C++20 and earlier).
- ``<new>`` no longer includes ``<exception>`` or ``<type_traits>`` in any C++ version (they were previously included in C++20 and earlier).
- ``<string>`` no longer includes ``<vector>`` in any C++ version (it was previously included in C++20 and earlier). - ``<string>`` no longer includes ``<vector>`` in any C++ version (it was previously included in C++20 and earlier).
- ``<string>``, ``<string_view>``, and ``<mutex>`` no longer include ``<functional>`` - ``<string>``, ``<string_view>``, and ``<mutex>`` no longer include ``<functional>``
in any C++ version (it was previously included in C++20 and earlier). in any C++ version (it was previously included in C++20 and earlier).
- The headers ``<experimental/algorithm>`` and ``<experimental/functional>`` have been removed, since all the contents - The headers ``<experimental/algorithm>`` and ``<experimental/functional>`` have been removed, since all the contents
have been implemented in namespace ``std`` for at least two releases. have been implemented in namespace ``std`` for at least two releases.
▲ Show 20 Lines • Show All 82 Lines • Show Last 20 Lines

libcxx/include/limits

Show First 20 Lines • Show All 817 Lines • ▼ Show 20 Linestemplate <class _Tp>
_LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::tinyness_before; _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::tinyness_before;
template <class _Tp> template <class _Tp>
_LIBCPP_CONSTEXPR const float_round_style numeric_limits<const volatile _Tp>::round_style; _LIBCPP_CONSTEXPR const float_round_style numeric_limits<const volatile _Tp>::round_style;
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS _LIBCPP_POP_MACROS
#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
# include <type_traits>
#endif
#endif // _LIBCPP_LIMITS #endif // _LIBCPP_LIMITS

libcxx/include/new

Show First 20 Lines • Show All 359 Lines • ▼ Show 20 Lines
inline constexpr size_t hardware_constructive_interference_size = __GCC_CONSTRUCTIVE_SIZE; inline constexpr size_t hardware_constructive_interference_size = __GCC_CONSTRUCTIVE_SIZE;
#endif // defined(__GCC_DESTRUCTIVE_SIZE) && defined(__GCC_CONSTRUCTIVE_SIZE) #endif // defined(__GCC_DESTRUCTIVE_SIZE) && defined(__GCC_CONSTRUCTIVE_SIZE)
#endif // _LIBCPP_STD_VER >= 17 #endif // _LIBCPP_STD_VER >= 17
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
# include <exception>
# include <type_traits>
#endif
#endif // _LIBCPP_NEW #endif // _LIBCPP_NEW

libcxx/test/libcxx/transitive_includes/cxx03.csv

Show First 20 Lines • Show All 450 Lines • ▼ Show 20 Lines
latch cstdint latch cstdint
latch cstring latch cstring
latch ctime latch ctime
latch iosfwd latch iosfwd
latch limits latch limits
latch ratio latch ratio
latch type_traits latch type_traits
latch version latch version
limits type_traits
limits version limits version
list algorithm list algorithm
list atomic list atomic
list compare list compare
list concepts list concepts
list cstddef list cstddef
list cstdint list cstdint
list cstdlib list cstdlib
▲ Show 20 Lines • Show All 98 Lines • ▼ Show 20 Lines
mutex stdexcept mutex stdexcept
mutex string mutex string
mutex system_error mutex system_error
mutex type_traits mutex type_traits
mutex typeinfo mutex typeinfo
mutex version mutex version
new cstddef new cstddef
new cstdlib new cstdlib
new exception
new type_traits
new version new version
numbers concepts numbers concepts
numbers type_traits numbers type_traits
numbers version numbers version
numeric climits numeric climits
numeric cmath numeric cmath
numeric concepts numeric concepts
numeric cstddef numeric cstddef
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
ostream streambuf ostream streambuf
ostream string ostream string
ostream type_traits ostream type_traits
ostream typeinfo ostream typeinfo
ostream version ostream version
queue compare queue compare
queue concepts queue concepts
queue cstddef queue cstddef
queue cstdint
queue cstdlib queue cstdlib
queue deque queue deque
queue functional queue functional
queue initializer_list queue initializer_list
queue limits queue limits
queue type_traits queue type_traits
queue vector queue vector
queue version queue version
▲ Show 20 Lines • Show All 119 Lines • ▼ Show 20 Lines
sstream istream sstream istream
sstream ostream sstream ostream
sstream string sstream string
sstream type_traits sstream type_traits
sstream version sstream version
stack compare stack compare
stack concepts stack concepts
stack cstddef stack cstddef
stack cstdint
stack deque stack deque
stack functional stack functional
stack initializer_list stack initializer_list
stack limits stack limits
stack type_traits stack type_traits
stack version stack version
stdexcept cstdlib stdexcept cstdlib
stdexcept exception stdexcept exception
▲ Show 20 Lines • Show All 146 Lines • ▼ Show 20 Lines
utility iosfwd utility iosfwd
utility limits utility limits
utility type_traits utility type_traits
utility version utility version
valarray algorithm valarray algorithm
valarray cmath valarray cmath
valarray concepts valarray concepts
valarray cstddef valarray cstddef
valarray cstdint
valarray cstdlib valarray cstdlib
valarray cstring valarray cstring
valarray functional valarray functional
valarray initializer_list valarray initializer_list
valarray limits valarray limits
valarray new valarray new
valarray stdexcept valarray stdexcept
valarray type_traits valarray type_traits
Show All 39 Lines

libcxx/test/libcxx/transitive_includes/cxx11.csv

Show First 20 Lines • Show All 450 Lines • ▼ Show 20 Lines
latch cstdint latch cstdint
latch cstring latch cstring
latch ctime latch ctime
latch iosfwd latch iosfwd
latch limits latch limits
latch ratio latch ratio
latch type_traits latch type_traits
latch version latch version
limits type_traits
limits version limits version
list algorithm list algorithm
list atomic list atomic
list compare list compare
list concepts list concepts
list cstddef list cstddef
list cstdint list cstdint
list cstdlib list cstdlib
▲ Show 20 Lines • Show All 99 Lines • ▼ Show 20 Lines
mutex string mutex string
mutex system_error mutex system_error
mutex tuple mutex tuple
mutex type_traits mutex type_traits
mutex typeinfo mutex typeinfo
mutex version mutex version
new cstddef new cstddef
new cstdlib new cstdlib
new exception
new type_traits
new version new version
numbers concepts numbers concepts
numbers type_traits numbers type_traits
numbers version numbers version
numeric climits numeric climits
numeric cmath numeric cmath
numeric concepts numeric concepts
numeric cstddef numeric cstddef
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
ostream streambuf ostream streambuf
ostream string ostream string
ostream type_traits ostream type_traits
ostream typeinfo ostream typeinfo
ostream version ostream version
queue compare queue compare
queue concepts queue concepts
queue cstddef queue cstddef
queue cstdint
queue cstdlib queue cstdlib
queue deque queue deque
queue functional queue functional
queue initializer_list queue initializer_list
queue limits queue limits
queue type_traits queue type_traits
queue vector queue vector
queue version queue version
▲ Show 20 Lines • Show All 119 Lines • ▼ Show 20 Lines
sstream istream sstream istream
sstream ostream sstream ostream
sstream string sstream string
sstream type_traits sstream type_traits
sstream version sstream version
stack compare stack compare
stack concepts stack concepts
stack cstddef stack cstddef
stack cstdint
stack deque stack deque
stack functional stack functional
stack initializer_list stack initializer_list
stack limits stack limits
stack type_traits stack type_traits
stack version stack version
stdexcept cstdlib stdexcept cstdlib
stdexcept exception stdexcept exception
▲ Show 20 Lines • Show All 146 Lines • ▼ Show 20 Lines
utility iosfwd utility iosfwd
utility limits utility limits
utility type_traits utility type_traits
utility version utility version
valarray algorithm valarray algorithm
valarray cmath valarray cmath
valarray concepts valarray concepts
valarray cstddef valarray cstddef
valarray cstdint
valarray cstdlib valarray cstdlib
valarray cstring valarray cstring
valarray functional valarray functional
valarray initializer_list valarray initializer_list
valarray limits valarray limits
valarray new valarray new
valarray stdexcept valarray stdexcept
valarray type_traits valarray type_traits
Show All 39 Lines

libcxx/test/libcxx/transitive_includes/cxx14.csv

Show First 20 Lines • Show All 452 Lines • ▼ Show 20 Lines
latch cstdint latch cstdint
latch cstring latch cstring
latch ctime latch ctime
latch iosfwd latch iosfwd
latch limits latch limits
latch ratio latch ratio
latch type_traits latch type_traits
latch version latch version
limits type_traits
limits version limits version
list algorithm list algorithm
list atomic list atomic
list compare list compare
list concepts list concepts
list cstddef list cstddef
list cstdint list cstdint
list cstdlib list cstdlib
▲ Show 20 Lines • Show All 99 Lines • ▼ Show 20 Lines
mutex string mutex string
mutex system_error mutex system_error
mutex tuple mutex tuple
mutex type_traits mutex type_traits
mutex typeinfo mutex typeinfo
mutex version mutex version
new cstddef new cstddef
new cstdlib new cstdlib
new exception
new type_traits
new version new version
numbers concepts numbers concepts
numbers type_traits numbers type_traits
numbers version numbers version
numeric climits numeric climits
numeric cmath numeric cmath
numeric concepts numeric concepts
numeric cstddef numeric cstddef
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
ostream streambuf ostream streambuf
ostream string ostream string
ostream type_traits ostream type_traits
ostream typeinfo ostream typeinfo
ostream version ostream version
queue compare queue compare
queue concepts queue concepts
queue cstddef queue cstddef
queue cstdint
queue cstdlib queue cstdlib
queue deque queue deque
queue functional queue functional
queue initializer_list queue initializer_list
queue limits queue limits
queue type_traits queue type_traits
queue vector queue vector
queue version queue version
▲ Show 20 Lines • Show All 119 Lines • ▼ Show 20 Lines
sstream istream sstream istream
sstream ostream sstream ostream
sstream string sstream string
sstream type_traits sstream type_traits
sstream version sstream version
stack compare stack compare
stack concepts stack concepts
stack cstddef stack cstddef
stack cstdint
stack deque stack deque
stack functional stack functional
stack initializer_list stack initializer_list
stack limits stack limits
stack type_traits stack type_traits
stack version stack version
stdexcept cstdlib stdexcept cstdlib
stdexcept exception stdexcept exception
▲ Show 20 Lines • Show All 146 Lines • ▼ Show 20 Lines
utility iosfwd utility iosfwd
utility limits utility limits
utility type_traits utility type_traits
utility version utility version
valarray algorithm valarray algorithm
valarray cmath valarray cmath
valarray concepts valarray concepts
valarray cstddef valarray cstddef
valarray cstdint
valarray cstdlib valarray cstdlib
valarray cstring valarray cstring
valarray functional valarray functional
valarray initializer_list valarray initializer_list
valarray limits valarray limits
valarray new valarray new
valarray stdexcept valarray stdexcept
valarray type_traits valarray type_traits
Show All 39 Lines

libcxx/test/libcxx/transitive_includes/cxx17.csv

Show First 20 Lines • Show All 452 Lines • ▼ Show 20 Lines
latch cstdint latch cstdint
latch cstring latch cstring
latch ctime latch ctime
latch iosfwd latch iosfwd
latch limits latch limits
latch ratio latch ratio
latch type_traits latch type_traits
latch version latch version
limits type_traits
limits version limits version
list algorithm list algorithm
list atomic list atomic
list compare list compare
list concepts list concepts
list cstddef list cstddef
list cstdint list cstdint
list cstdlib list cstdlib
▲ Show 20 Lines • Show All 99 Lines • ▼ Show 20 Lines
mutex string mutex string
mutex system_error mutex system_error
mutex tuple mutex tuple
mutex type_traits mutex type_traits
mutex typeinfo mutex typeinfo
mutex version mutex version
new cstddef new cstddef
new cstdlib new cstdlib
new exception
new type_traits
new version new version
numbers concepts numbers concepts
numbers type_traits numbers type_traits
numbers version numbers version
numeric climits numeric climits
numeric cmath numeric cmath
numeric concepts numeric concepts
numeric cstddef numeric cstddef
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
ostream streambuf ostream streambuf
ostream string ostream string
ostream type_traits ostream type_traits
ostream typeinfo ostream typeinfo
ostream version ostream version
queue compare queue compare
queue concepts queue concepts
queue cstddef queue cstddef
queue cstdint
queue cstdlib queue cstdlib
queue deque queue deque
queue functional queue functional
queue initializer_list queue initializer_list
queue limits queue limits
queue type_traits queue type_traits
queue vector queue vector
queue version queue version
▲ Show 20 Lines • Show All 119 Lines • ▼ Show 20 Lines
sstream istream sstream istream
sstream ostream sstream ostream
sstream string sstream string
sstream type_traits sstream type_traits
sstream version sstream version
stack compare stack compare
stack concepts stack concepts
stack cstddef stack cstddef
stack cstdint
stack deque stack deque
stack functional stack functional
stack initializer_list stack initializer_list
stack limits stack limits
stack type_traits stack type_traits
stack version stack version
stdexcept cstdlib stdexcept cstdlib
stdexcept exception stdexcept exception
▲ Show 20 Lines • Show All 146 Lines • ▼ Show 20 Lines
utility iosfwd utility iosfwd
utility limits utility limits
utility type_traits utility type_traits
utility version utility version
valarray algorithm valarray algorithm
valarray cmath valarray cmath
valarray concepts valarray concepts
valarray cstddef valarray cstddef
valarray cstdint
valarray cstdlib valarray cstdlib
valarray cstring valarray cstring
valarray functional valarray functional
valarray initializer_list valarray initializer_list
valarray limits valarray limits
valarray new valarray new
valarray stdexcept valarray stdexcept
valarray type_traits valarray type_traits
Show All 39 Lines

libcxx/test/libcxx/transitive_includes/cxx20.csv

Show First 20 Lines • Show All 458 Lines • ▼ Show 20 Lines
latch cstdint latch cstdint
latch cstring latch cstring
latch ctime latch ctime
latch iosfwd latch iosfwd
latch limits latch limits
latch ratio latch ratio
latch type_traits latch type_traits
latch version latch version
limits type_traits
limits version limits version
list algorithm list algorithm
list atomic list atomic
list compare list compare
list concepts list concepts
list cstddef list cstddef
list cstdint list cstdint
list cstdlib list cstdlib
▲ Show 20 Lines • Show All 99 Lines • ▼ Show 20 Lines
mutex string mutex string
mutex system_error mutex system_error
mutex tuple mutex tuple
mutex type_traits mutex type_traits
mutex typeinfo mutex typeinfo
mutex version mutex version
new cstddef new cstddef
new cstdlib new cstdlib
new exception
new type_traits
new version new version
numbers concepts numbers concepts
numbers type_traits numbers type_traits
numbers version numbers version
numeric climits numeric climits
numeric cmath numeric cmath
numeric concepts numeric concepts
numeric cstddef numeric cstddef
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
ostream streambuf ostream streambuf
ostream string ostream string
ostream type_traits ostream type_traits
ostream typeinfo ostream typeinfo
ostream version ostream version
queue compare queue compare
queue concepts queue concepts
queue cstddef queue cstddef
queue cstdint
queue cstdlib queue cstdlib
queue deque queue deque
queue functional queue functional
queue initializer_list queue initializer_list
queue limits queue limits
queue type_traits queue type_traits
queue vector queue vector
queue version queue version
▲ Show 20 Lines • Show All 119 Lines • ▼ Show 20 Lines
sstream istream sstream istream
sstream ostream sstream ostream
sstream string sstream string
sstream type_traits sstream type_traits
sstream version sstream version
stack compare stack compare
stack concepts stack concepts
stack cstddef stack cstddef
stack cstdint
stack deque stack deque
stack functional stack functional
stack initializer_list stack initializer_list
stack limits stack limits
stack type_traits stack type_traits
stack version stack version
stdexcept cstdlib stdexcept cstdlib
stdexcept exception stdexcept exception
▲ Show 20 Lines • Show All 145 Lines • ▼ Show 20 Lines
utility iosfwd utility iosfwd
utility limits utility limits
utility type_traits utility type_traits
utility version utility version
valarray algorithm valarray algorithm
valarray cmath valarray cmath
valarray concepts valarray concepts
valarray cstddef valarray cstddef
valarray cstdint
valarray cstdlib valarray cstdlib
valarray cstring valarray cstring
valarray functional valarray functional
valarray initializer_list valarray initializer_list
valarray limits valarray limits
valarray new valarray new
valarray stdexcept valarray stdexcept
valarray type_traits valarray type_traits
Show All 39 Lines