[libc++][modules] Consolidate leaf modules into their own top-level modules #107147
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Louis Dionne (ldionne) ChangesSome modules are leaf modules in the sense that they are not used by any other part of the headers. These leaf modules are easy to consolidate since there is no risk to create a cycle. As a result of regrouping these modules, a few additional missing includes were found and fixed in this patch. Full diff: https://github.com/llvm/llvm-project/pull/107147.diff 5 Files Affected:
diff --git a/libcxx/include/__filesystem/directory_entry.h b/libcxx/include/__filesystem/directory_entry.h
index 96d88dcd90b4c0..2c638e7ee354bd 100644
--- a/libcxx/include/__filesystem/directory_entry.h
+++ b/libcxx/include/__filesystem/directory_entry.h
@@ -20,6 +20,7 @@
#include <__filesystem/operations.h>
#include <__filesystem/path.h>
#include <__filesystem/perms.h>
+#include <__fwd/ostream.h>
#include <__system_error/errc.h>
#include <__system_error/error_code.h>
#include <__utility/move.h>
diff --git a/libcxx/include/__mdspan/layout_left.h b/libcxx/include/__mdspan/layout_left.h
index d058cbccffd96d..59574e83b0d7b1 100644
--- a/libcxx/include/__mdspan/layout_left.h
+++ b/libcxx/include/__mdspan/layout_left.h
@@ -21,6 +21,7 @@
#include <__config>
#include <__fwd/mdspan.h>
#include <__mdspan/extents.h>
+#include <__type_traits/common_type.h>
#include <__type_traits/is_constructible.h>
#include <__type_traits/is_convertible.h>
#include <__type_traits/is_nothrow_constructible.h>
diff --git a/libcxx/include/__mdspan/layout_right.h b/libcxx/include/__mdspan/layout_right.h
index 6842e9dc37fdcc..d1acdb41238f7f 100644
--- a/libcxx/include/__mdspan/layout_right.h
+++ b/libcxx/include/__mdspan/layout_right.h
@@ -21,6 +21,7 @@
#include <__config>
#include <__fwd/mdspan.h>
#include <__mdspan/extents.h>
+#include <__type_traits/common_type.h>
#include <__type_traits/is_constructible.h>
#include <__type_traits/is_convertible.h>
#include <__type_traits/is_nothrow_constructible.h>
diff --git a/libcxx/include/__mdspan/layout_stride.h b/libcxx/include/__mdspan/layout_stride.h
index 86148ac849eca5..704a5a4c1aea51 100644
--- a/libcxx/include/__mdspan/layout_stride.h
+++ b/libcxx/include/__mdspan/layout_stride.h
@@ -18,12 +18,15 @@
#define _LIBCPP___MDSPAN_LAYOUT_STRIDE_H
#include <__assert>
+#include <__concepts/same_as.h>
#include <__config>
#include <__fwd/mdspan.h>
#include <__mdspan/extents.h>
+#include <__type_traits/common_type.h>
#include <__type_traits/is_constructible.h>
#include <__type_traits/is_convertible.h>
#include <__type_traits/is_nothrow_constructible.h>
+#include <__type_traits/is_same.h>
#include <__utility/as_const.h>
#include <__utility/integer_sequence.h>
#include <__utility/swap.h>
@@ -31,6 +34,7 @@
#include <cinttypes>
#include <cstddef>
#include <limits>
+#include <span>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/libcxx/include/module.modulemap b/libcxx/include/module.modulemap
index f193b5d95f49f5..2a2857f7d504a2 100644
--- a/libcxx/include/module.modulemap
+++ b/libcxx/include/module.modulemap
@@ -29,6 +29,16 @@ module std_bitset [system] {
}
module std_charconv [system] {
header "charconv"
+ module chars_format { header "__charconv/chars_format.h" }
+ module from_chars_integral { header "__charconv/from_chars_integral.h" }
+ module from_chars_result { header "__charconv/from_chars_result.h" }
+ module tables { header "__charconv/tables.h" }
+ module to_chars { header "__charconv/to_chars.h" }
+ module to_chars_base_10 { header "__charconv/to_chars_base_10.h" }
+ module to_chars_floating_point { header "__charconv/to_chars_floating_point.h" }
+ module to_chars_integral { header "__charconv/to_chars_integral.h" }
+ module to_chars_result { header "__charconv/to_chars_result.h" }
+ module traits { header "__charconv/traits.h" }
export *
}
module std_chrono [system] {
@@ -53,10 +63,15 @@ module std_concepts [system] {
}
module std_condition_variable [system] {
header "condition_variable"
+ module condition_variable { header "__condition_variable/condition_variable.h" }
export *
}
module std_coroutine [system] {
header "coroutine"
+ module coroutine_handle { header "__coroutine/coroutine_handle.h" }
+ module coroutine_traits { header "__coroutine/coroutine_traits.h" }
+ module noop_coroutine_handle { header "__coroutine/noop_coroutine_handle.h" }
+ module trivial_awaitables { header "__coroutine/trivial_awaitables.h" }
export *
}
module std_deque [system] {
@@ -77,6 +92,22 @@ module std_expected [system] {
}
module std_filesystem [system] {
header "filesystem"
+ module copy_options { header "__filesystem/copy_options.h" }
+ module directory_entry { header "__filesystem/directory_entry.h" }
+ module directory_iterator { header "__filesystem/directory_iterator.h" }
+ module directory_options { header "__filesystem/directory_options.h" }
+ module file_status { header "__filesystem/file_status.h" }
+ module file_time_type { header "__filesystem/file_time_type.h" }
+ module file_type { header "__filesystem/file_type.h" }
+ module filesystem_error { header "__filesystem/filesystem_error.h" }
+ module operations { header "__filesystem/operations.h" }
+ module path { header "__filesystem/path.h" }
+ module path_iterator { header "__filesystem/path_iterator.h" }
+ module perm_options { header "__filesystem/perm_options.h" }
+ module perms { header "__filesystem/perms.h" }
+ module recursive_directory_iterator { header "__filesystem/recursive_directory_iterator.h" }
+ module space_info { header "__filesystem/space_info.h" }
+ module u8path { header "__filesystem/u8path.h" }
export *
}
module std_format [system] {
@@ -149,6 +180,13 @@ module std_map [system] {
}
module std_mdspan [system] {
header "mdspan"
+ module default_accessor { header "__mdspan/default_accessor.h" }
+ module extents { header "__mdspan/extents.h" }
+ module fwd { header "__fwd/mdspan.h" }
+ module layout_left { header "__mdspan/layout_left.h" }
+ module layout_right { header "__mdspan/layout_right.h" }
+ module layout_stride { header "__mdspan/layout_stride.h" }
+ module mdspan { header "__mdspan/mdspan.h" }
export *
}
module std_memory [system] {
@@ -1082,23 +1120,6 @@ module std_private_bit_invert_if [system] { header "__bit/invert_if.h" }
module std_private_bit_popcount [system] { header "__bit/popcount.h" }
module std_private_bit_rotate [system] { header "__bit/rotate.h" }
-module std_private_charconv_chars_format [system] { header "__charconv/chars_format.h" }
-module std_private_charconv_from_chars_integral [system] { header "__charconv/from_chars_integral.h" }
-module std_private_charconv_from_chars_result [system] { header "__charconv/from_chars_result.h" }
-module std_private_charconv_tables [system] { header "__charconv/tables.h" }
-module std_private_charconv_to_chars [system] { header "__charconv/to_chars.h" }
-module std_private_charconv_to_chars_base_10 [system] { header "__charconv/to_chars_base_10.h" }
-module std_private_charconv_to_chars_floating_point [system] { header "__charconv/to_chars_floating_point.h" }
-module std_private_charconv_to_chars_integral [system] {
- header "__charconv/to_chars_integral.h"
- export std_private_charconv_traits
-}
-module std_private_charconv_to_chars_result [system] {
- header "__charconv/to_chars_result.h"
- export *
-}
-module std_private_charconv_traits [system] { header "__charconv/traits.h" }
-
module std_private_chrono_calendar [system] { header "__chrono/calendar.h" }
module std_private_chrono_concepts [system] { header "__chrono/concepts.h" }
module std_private_chrono_convert_to_timespec [system] { header "__chrono/convert_to_timespec.h" }
@@ -1223,16 +1244,6 @@ module std_private_concepts_semiregular [system] { header "__concepts/
module std_private_concepts_swappable [system] { header "__concepts/swappable.h" }
module std_private_concepts_totally_ordered [system] { header "__concepts/totally_ordered.h" }
-module std_private_condition_variable_condition_variable [system] {
- header "__condition_variable/condition_variable.h"
- export *
-}
-
-module std_private_coroutine_coroutine_handle [system] { header "__coroutine/coroutine_handle.h" }
-module std_private_coroutine_coroutine_traits [system] { header "__coroutine/coroutine_traits.h" }
-module std_private_coroutine_noop_coroutine_handle [system] { header "__coroutine/noop_coroutine_handle.h" }
-module std_private_coroutine_trivial_awaitables [system] { header "__coroutine/trivial_awaitables.h" }
-
module std_private_debug_utils_randomize_range [system] { header "__debug_utils/randomize_range.h" }
module std_private_debug_utils_sanitizers [system] { header "__debug_utils/sanitizers.h" }
module std_private_debug_utils_strict_weak_ordering_check [system] {
@@ -1256,38 +1267,6 @@ module std_private_expected_expected [system] { header "__expected/ex
module std_private_expected_unexpect [system] { header "__expected/unexpect.h" }
module std_private_expected_unexpected [system] { header "__expected/unexpected.h" }
-module std_private_filesystem_copy_options [system] { header "__filesystem/copy_options.h" }
-module std_private_filesystem_directory_entry [system] {
- header "__filesystem/directory_entry.h"
- export *
-}
-module std_private_filesystem_directory_iterator [system] {
- header "__filesystem/directory_iterator.h"
- export *
-}
-module std_private_filesystem_directory_options [system] { header "__filesystem/directory_options.h" }
-module std_private_filesystem_file_status [system] { header "__filesystem/file_status.h" }
-module std_private_filesystem_file_time_type [system] { header "__filesystem/file_time_type.h" }
-module std_private_filesystem_file_type [system] { header "__filesystem/file_type.h" }
-module std_private_filesystem_filesystem_error [system] {
- header "__filesystem/filesystem_error.h"
- export *
-}
-module std_private_filesystem_operations [system] { header "__filesystem/operations.h" }
-module std_private_filesystem_path [system] {
- header "__filesystem/path.h"
- export *
-}
-module std_private_filesystem_path_iterator [system] { header "__filesystem/path_iterator.h" }
-module std_private_filesystem_perm_options [system] { header "__filesystem/perm_options.h" }
-module std_private_filesystem_perms [system] { header "__filesystem/perms.h" }
-module std_private_filesystem_recursive_directory_iterator [system] {
- header "__filesystem/recursive_directory_iterator.h"
- export *
-}
-module std_private_filesystem_space_info [system] { header "__filesystem/space_info.h" }
-module std_private_filesystem_u8path [system] { header "__filesystem/u8path.h" }
-
module std_private_format_buffer [system] { header "__format/buffer.h" }
module std_private_format_concepts [system] { header "__format/concepts.h" }
module std_private_format_container_adaptor [system] { header "__format/container_adaptor.h" }
@@ -1496,17 +1475,6 @@ module std_private_math_special_functions [system] { header "__mat
module std_private_math_traits [system] { header "__math/traits.h" }
module std_private_math_trigonometric_functions [system] { header "__math/trigonometric_functions.h" }
-module std_private_mdspan_default_accessor [system] { header "__mdspan/default_accessor.h" }
-module std_private_mdspan_extents [system] {
- header "__mdspan/extents.h"
- export *
-}
-module std_private_mdspan_layout_left [system] { header "__mdspan/layout_left.h" }
-module std_private_mdspan_layout_right [system] { header "__mdspan/layout_right.h" }
-module std_private_mdspan_layout_stride [system] { header "__mdspan/layout_stride.h" }
-module std_private_mdspan_mdspan [system] { header "__mdspan/mdspan.h" }
-module std_private_mdspan_mdspan_fwd [system] { header "__fwd/mdspan.h" }
-
module std_private_memory_addressof [system] { header "__memory/addressof.h" }
module std_private_memory_align [system] { header "__memory/align.h" }
module std_private_memory_aligned_alloc [system] { header "__memory/aligned_alloc.h" }
|
philnik777
approved these changes
Sep 3, 2024
…odules Some modules are leaf modules in the sense that they are not used by any other part of the headers. These leaf modules are easy to consolidate since there is no risk to create a cycle. As a result of regrouping these modules, a few additional missing includes were found and fixed in this patch.
ldionne
force-pushed
the
review/modularization-consolidate-leaf-modules
branch
from
b6563a9 to
5b139cd
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some modules are leaf modules in the sense that they are not used by any other part of the headers. These leaf modules are easy to consolidate since there is no risk to create a cycle. As a result of regrouping these modules, several missing includes were found and fixed in this patch.