[libc++][Modules] std.functional.__functional.invoke and std.type_traits.underlying_type can't export std.type_traits

[iana]

Summary

__functional/invoke.h currently only includes __type_traits/invoke.h and not all of type_traits. Keep it using the specific header, and update its export. Similarly, __type_traits/underlying_type.h currently only includes __type_traits/is_enum.h, so update its export as well. This requires adding lots of export statements to the module map to keep the transitive includes working. Adding direct includes to the headers fixes check-cxx, but leaves many run-buildbot generic-modules tests failing, some even with linker errors.

[iana]

Pick up changes from D153211

[iana]

Rebase

[iana]

Add some missing exports that were exposed by removing previously added includes

[iana]

Rebase

[iana]

D153672 replaced __debug, whose module did export *, with __debug_utils/strict_weak_ordering_check.h, whose module has no exports. Other parts were relying on __debug's module exporting __type_traits/is_constant_evaluated.h. Make __debug_utils/strict_weak_ordering_check.h export that, and update __algorithm/sort.h's module to export __debug_utils/strict_weak_ordering_check.h.

[iana]

Rebase, fix merge conflict

[ldionne]

LGTM without the script.

I spoke at length with @iana about this patch, in particular about the fact that these exports are pretty arbitrary. They are, but so are some of the exports we already have in the modulemap anyway. Let's move forward with this because I get the feeling that the only way to make progress here is to get to D144322 ASAP and then clean up the mess in our modulemap once we can actually see failures in the CI.

libcxx/utils/find_transitive_includes.py

1

Let's not check in this script since it was only (?) useful as a tool for you to come up with this patch. We don't expect to ever have to do this again, right?

libcxx/include/module.modulemap.in

module algorithm {
     module __algorithm {
       module adjacent_find                   { private header "__algorithm/adjacent_find.h" }
       module all_of                          { private header "__algorithm/all_of.h" }
       module any_of                          { private header "__algorithm/any_of.h" }
       module binary_search                   { private header "__algorithm/binary_search.h" }
       module clamp                           { private header "__algorithm/clamp.h" }
       module comp                            { private header "__algorithm/comp.h" }
       module comp_ref_type                   { private header "__algorithm/comp_ref_type.h" }
-      module copy                            { private header "__algorithm/copy.h" }
+      module copy                            {
+        private header "__algorithm/copy.h"
+        export algorithm.__algorithm.copy_move_common
+      }
       module copy_backward                   { private header "__algorithm/copy_backward.h" }
       module copy_if                         { private header "__algorithm/copy_if.h" }
-      module copy_move_common                { private header "__algorithm/copy_move_common.h" }
+      module copy_move_common                {
+        private header "__algorithm/copy_move_common.h"
+        export type_traits.is_trivially_copyable
+      }
       module copy_n                          { private header "__algorithm/copy_n.h" }
       module count                           { private header "__algorithm/count.h" }
       module count_if                        { private header "__algorithm/count_if.h" }
       module equal                           { private header "__algorithm/equal.h" }
       module equal_range                     { private header "__algorithm/equal_range.h" }
       module fill                            { private header "__algorithm/fill.h" }
       module fill_n                          { private header "__algorithm/fill_n.h" }
       module find                            { private header "__algorithm/find.h" }
module __algorithm {
       module set_difference                  { private header "__algorithm/set_difference.h" }
       module set_intersection                { private header "__algorithm/set_intersection.h" }
       module set_symmetric_difference        { private header "__algorithm/set_symmetric_difference.h" }
       module set_union                       { private header "__algorithm/set_union.h" }
       module shift_left                      { private header "__algorithm/shift_left.h" }
       module shift_right                     { private header "__algorithm/shift_right.h" }
       module shuffle                         { private header "__algorithm/shuffle.h" }
       module sift_down                       { private header "__algorithm/sift_down.h" }
-      module sort                            { private header "__algorithm/sort.h" }
+      module sort                            {
+        private header "__algorithm/sort.h"
+        export __debug_utils.strict_weak_ordering_check
+      }
       module sort_heap                       { private header "__algorithm/sort_heap.h" }
       module stable_partition                { private header "__algorithm/stable_partition.h" }
       module stable_sort                     { private header "__algorithm/stable_sort.h" }
-      module swap_ranges                     { private header "__algorithm/swap_ranges.h" }
+      module swap_ranges                     {
+        private header "__algorithm/swap_ranges.h"
+        export algorithm.__algorithm.iterator_operations
+      }
       module three_way_comp_ref_type         { private header "__algorithm/three_way_comp_ref_type.h" }
       module transform                       { private header "__algorithm/transform.h" }
       module unique                          { private header "__algorithm/unique.h" }
       module unique_copy                     { private header "__algorithm/unique_copy.h" }
-      module unwrap_iter                     { private header "__algorithm/unwrap_iter.h" }
+      module unwrap_iter                     {
+        private header "__algorithm/unwrap_iter.h"
+        export iterator.__iterator.iterator_traits
+      }
       module unwrap_range {
         private header "__algorithm/unwrap_range.h"
         export utility.__utility.pair
       }
       module upper_bound                     { private header "__algorithm/upper_bound.h" }
     }
   }
   module any {
module concepts {
 
     module __concepts {
       module arithmetic                 { private header "__concepts/arithmetic.h" }
       module assignable                 { private header "__concepts/assignable.h" }
       module boolean_testable           { private header "__concepts/boolean_testable.h" }
       module class_or_enum              { private header "__concepts/class_or_enum.h" }
       module common_reference_with      { private header "__concepts/common_reference_with.h" }
       module common_with                { private header "__concepts/common_with.h" }
-      module constructible              { private header "__concepts/constructible.h" }
+      module constructible              {
+        private header "__concepts/constructible.h"
+        export concepts.__concepts.destructible
+      }
       module convertible_to             { private header "__concepts/convertible_to.h" }
       module copyable                   { private header "__concepts/copyable.h" }
       module derived_from               { private header "__concepts/derived_from.h" }
-      module destructible               { private header "__concepts/destructible.h" }
+      module destructible               {
+        private header "__concepts/destructible.h"
+        export type_traits.is_nothrow_destructible
+      }
       module different_from             { private header "__concepts/different_from.h" }
       module equality_comparable {
         private header "__concepts/equality_comparable.h"
         export type_traits.common_reference
       }
       module invocable                  { private header "__concepts/invocable.h" }
-      module movable                    { private header "__concepts/movable.h" }
+      module movable                    {
+        private header "__concepts/movable.h"
+        export type_traits.is_object
+      }
       module predicate                  { private header "__concepts/predicate.h" }
       module regular                    { private header "__concepts/regular.h" }
       module relation                   { private header "__concepts/relation.h" }
       module same_as {
         private header "__concepts/same_as.h"
         export type_traits.is_same
       }
       module semiregular                { private header "__concepts/semiregular.h" }
module functional {
     module __functional {
       module binary_function            { private header "__functional/binary_function.h" }
       module binary_negate              { private header "__functional/binary_negate.h" }
       module bind                       { private header "__functional/bind.h" }
       module bind_back                  { private header "__functional/bind_back.h" }
       module bind_front                 { private header "__functional/bind_front.h" }
       module binder1st                  { private header "__functional/binder1st.h" }
       module binder2nd                  { private header "__functional/binder2nd.h" }
-      module boyer_moore_searcher       { private header "__functional/boyer_moore_searcher.h" }
+      module boyer_moore_searcher       {
+        private header "__functional/boyer_moore_searcher.h"
+        export memory.__memory.shared_ptr
+      }
       module compose                    { private header "__functional/compose.h" }
       module default_searcher           { private header "__functional/default_searcher.h" }
       module function                   { private header "__functional/function.h" }
-      module hash                       { private header "__functional/hash.h" }
+      module hash                       {
+        private header "__functional/hash.h"
+        export compat.cstdint
+        export type_traits.underlying_type
+        export utility.__utility.pair
+      }
       module hash_fwd                   { private header "__fwd/hash.h" }
       module identity                   { private header "__functional/identity.h" }
       module invoke                     {
         private header "__functional/invoke.h"
-        export type_traits
+        export *
       }
       module is_transparent             { private header "__functional/is_transparent.h" }
       module mem_fn                     { private header "__functional/mem_fn.h" }
       module mem_fun_ref                { private header "__functional/mem_fun_ref.h" }
       module not_fn                     { private header "__functional/not_fn.h" }
       module operations                 { private header "__functional/operations.h" }
-      module perfect_forward            { private header "__functional/perfect_forward.h" }
+      module perfect_forward            {
+        private header "__functional/perfect_forward.h"
+        export *
+      }
       module pointer_to_binary_function { private header "__functional/pointer_to_binary_function.h" }
       module pointer_to_unary_function  { private header "__functional/pointer_to_unary_function.h" }
       module ranges_operations          { private header "__functional/ranges_operations.h" }
       module reference_wrapper          { private header "__functional/reference_wrapper.h" }
       module unary_function             { private header "__functional/unary_function.h" }
       module unary_negate               { private header "__functional/unary_negate.h" }
       module weak_result_type           { private header "__functional/weak_result_type.h" }
     }
module __iterator {
       module access                  { private header "__iterator/access.h" }
       module advance                 { private header "__iterator/advance.h" }
       module back_insert_iterator    { private header "__iterator/back_insert_iterator.h" }
       module bounded_iter            { private header "__iterator/bounded_iter.h" }
       module common_iterator         { private header "__iterator/common_iterator.h" }
       module cpp17_iterator_concepts { private header "__iterator/cpp17_iterator_concepts.h" }
       module concepts {
         private header "__iterator/concepts.h"
+        export std.concepts.__concepts.constructible
         export std.concepts.__concepts.equality_comparable
+        export std.concepts.__concepts.movable
         export type_traits.common_reference
+        export type_traits.is_reference
+        export type_traits.remove_cvref
       }
       module counted_iterator      { private header "__iterator/counted_iterator.h" }
       module data                  { private header "__iterator/data.h" }
       module default_sentinel      { private header "__iterator/default_sentinel.h" }
-      module distance              { private header "__iterator/distance.h" }
+      module distance              {
+        private header "__iterator/distance.h"
+        export ranges.__ranges.size
+      }
       module empty                 { private header "__iterator/empty.h" }
       module erase_if_container    { private header "__iterator/erase_if_container.h" }
       module front_insert_iterator { private header "__iterator/front_insert_iterator.h" }
       module incrementable_traits  { private header "__iterator/incrementable_traits.h" }
       module indirectly_comparable { private header "__iterator/indirectly_comparable.h" }
       module insert_iterator       { private header "__iterator/insert_iterator.h" }
       module istream_iterator      { private header "__iterator/istream_iterator.h" }
       module istreambuf_iterator   { private header "__iterator/istreambuf_iterator.h" }
       module iter_move             { private header "__iterator/iter_move.h" }
       module iter_swap             { private header "__iterator/iter_swap.h" }
       module iterator              { private header "__iterator/iterator.h" }
-      module iterator_traits       { private header "__iterator/iterator_traits.h" }
+      module iterator_traits       {
+        private header "__iterator/iterator_traits.h"
+        export type_traits.is_primary_template
+      }
       module iterator_with_data    { private header "__iterator/iterator_with_data.h" }
       module mergeable {
         private header "__iterator/mergeable.h"
         export functional.__functional.ranges_operations
       }
       module move_iterator         { private header "__iterator/move_iterator.h" }
       module move_sentinel         { private header "__iterator/move_sentinel.h" }
       module next                  { private header "__iterator/next.h" }

   module latch {
     @requires_LIBCXX_ENABLE_THREADS@
     header "latch"
     export *
   }
 
   module __debug_utils {
     module randomize_range            { private header "__debug_utils/randomize_range.h" }
-    module strict_weak_ordering_check { private header "__debug_utils/strict_weak_ordering_check.h" }
+    module strict_weak_ordering_check {
+      private header "__debug_utils/strict_weak_ordering_check.h"
+      export type_traits.is_constant_evaluated
+    }
   }
 
   module limits {
     header "limits"
     export *
   }
   module list {
     header "list"
module __memory {
       module destruct_n                      { private header "__memory/destruct_n.h" }
       module pointer_traits                  { private header "__memory/pointer_traits.h" }
       module ranges_construct_at             { private header "__memory/ranges_construct_at.h" }
       module ranges_uninitialized_algorithms {
         private header "__memory/ranges_uninitialized_algorithms.h"
         export algorithm.__algorithm.in_out_result
       }
       module raw_storage_iterator            { private header "__memory/raw_storage_iterator.h" }
-      module shared_ptr                      { private header "__memory/shared_ptr.h" }
+      module shared_ptr                      {
+        private header "__memory/shared_ptr.h"
+        export memory.__memory.uninitialized_algorithms
+      }
       module swap_allocator                  { private header "__memory/swap_allocator.h" }
       module temp_value                      { private header "__memory/temp_value.h" }
       module temporary_buffer                { private header "__memory/temporary_buffer.h" }
-      module uninitialized_algorithms        { private header "__memory/uninitialized_algorithms.h" }
-      module unique_ptr                      { private header "__memory/unique_ptr.h" }
+      module uninitialized_algorithms        {
+        private header "__memory/uninitialized_algorithms.h"
+        export algorithm.__algorithm.copy
+      }
+      module unique_ptr                      {
+        private header "__memory/unique_ptr.h"
+        export type_traits.add_lvalue_reference
+        export type_traits.is_pointer
+        export type_traits.type_identity
+      }
       module uses_allocator                  { private header "__memory/uses_allocator.h" }
       module uses_allocator_construction     { private header "__memory/uses_allocator_construction.h" }
       module voidify                         { private header "__memory/voidify.h" }
     }
   }
   module memory_resource {
     header "memory_resource"
     export *
module __ranges {
       module access                     { private header "__ranges/access.h" }
       module all                        {
         private header "__ranges/all.h"
         export functional.__functional.compose
         export functional.__functional.perfect_forward
       }
       module as_rvalue_view             { private header "__ranges/as_rvalue_view.h" }
       module common_view                { private header "__ranges/common_view.h" }
-      module concepts                   { private header "__ranges/concepts.h" }
+      module concepts                   {
+        private header "__ranges/concepts.h"
+        export iterator.__iterator.concepts
+      }
       module container_compatible_range { private header "__ranges/container_compatible_range.h" }
       module counted                    {
         private header "__ranges/counted.h"
         export span
       }
       module dangling                   { private header "__ranges/dangling.h" }
       module data                       { private header "__ranges/data.h" }
       module drop_view                  { private header "__ranges/drop_view.h" }
module __ranges {
       module non_propagating_cache      { private header "__ranges/non_propagating_cache.h" }
       module owning_view                { private header "__ranges/owning_view.h" }
       module range_adaptor              { private header "__ranges/range_adaptor.h" }
       module rbegin                     { private header "__ranges/rbegin.h" }
       module ref_view                   { private header "__ranges/ref_view.h" }
       module rend                       { private header "__ranges/rend.h" }
       module reverse_view               { private header "__ranges/reverse_view.h" }
       module single_view                { private header "__ranges/single_view.h" }
-      module size                       { private header "__ranges/size.h" }
+      module size                       {
+        private header "__ranges/size.h"
+        export type_traits.make_unsigned
+      }
       module split_view                 { private header "__ranges/split_view.h" }
       module subrange                   {
         private header "__ranges/subrange.h"
         export subrange_fwd
       }
-      module subrange_fwd               { private header "__fwd/subrange.h" }
+      module subrange_fwd               {
+        private header "__fwd/subrange.h"
+        export iterator.__iterator.concepts
+      }
       module take_view                  { private header "__ranges/take_view.h" }
       module take_while_view            { private header "__ranges/take_while_view.h" }
       module transform_view             {
         private header "__ranges/transform_view.h"
         export functional.__functional.bind_back
         export functional.__functional.perfect_forward
       }
       module view_interface             { private header "__ranges/view_interface.h" }
module streambuf {
     export *
   }
   module string {
     header "string"
     export initializer_list
     export string_view
     module __string {
       module char_traits           { private header "__string/char_traits.h" }
-      module constexpr_c_functions { private header "__string/constexpr_c_functions.h" }
+      module constexpr_c_functions {
+        private header "__string/constexpr_c_functions.h"
+        export type_traits.is_equality_comparable
+      }
       module extern_template_lists { private header "__string/extern_template_lists.h" }
       module string_fwd            { private header "__fwd/string.h" }
     }
     export *
   }
   module string_view {
     header "string_view"
     export *
module tuple {
     module tuple_types      { private header "__tuple/tuple_types.h" }
   }
   module type_traits {
     header "type_traits"
     export *
 
     module add_const                                 { private header "__type_traits/add_const.h" }
     module add_cv                                    { private header "__type_traits/add_cv.h" }
-    module add_lvalue_reference                      { private header "__type_traits/add_lvalue_reference.h" }
+    module add_lvalue_reference                      {
+      private header "__type_traits/add_lvalue_reference.h"
+      export is_referenceable
+    }
     module add_pointer                               { private header "__type_traits/add_pointer.h" }
     module add_rvalue_reference                      { private header "__type_traits/add_rvalue_reference.h" }
     module add_volatile                              { private header "__type_traits/add_volatile.h" }
     module aligned_storage                           { private header "__type_traits/aligned_storage.h" }
     module aligned_union                             { private header "__type_traits/aligned_union.h" }
     module alignment_of                              { private header "__type_traits/alignment_of.h" }
-    module apply_cv                                  { private header "__type_traits/apply_cv.h" }
+    module apply_cv                                  {
+      private header "__type_traits/apply_cv.h"
+      export is_const
+      export is_volatile
+    }
     module can_extract_key                           { private header "__type_traits/can_extract_key.h" }
     module common_reference                          { private header "__type_traits/common_reference.h" }
-    module common_type                               { private header "__type_traits/common_type.h" }
+    module common_type                               {
+      private header "__type_traits/common_type.h"
+      export utility.__utility.declval
+    }
     module conditional                               { private header "__type_traits/conditional.h" }
     module conjunction                               { private header "__type_traits/conjunction.h" }
     module copy_cv                                   { private header "__type_traits/copy_cv.h" }
     module copy_cvref                                { private header "__type_traits/copy_cvref.h" }
     module datasizeof                                { private header "__type_traits/datasizeof.h" }
-    module decay                                     { private header "__type_traits/decay.h" }
+    module decay                                     {
+      private header "__type_traits/decay.h"
+      export add_pointer
+    }
     module dependent_type                            { private header "__type_traits/dependent_type.h" }
     module disjunction                               { private header "__type_traits/disjunction.h" }
     module enable_if                                 { private header "__type_traits/enable_if.h" }
     module extent                                    { private header "__type_traits/extent.h" }
     module has_unique_object_representation          { private header "__type_traits/has_unique_object_representation.h" }
     module has_virtual_destructor                    { private header "__type_traits/has_virtual_destructor.h" }
     module integral_constant                         { private header "__type_traits/integral_constant.h" }
-    module invoke                                    { private header "__type_traits/invoke.h" }
+    module invoke                                    {
+      private header "__type_traits/invoke.h"
+      export conditional
+      export decay
+      export is_base_of
+      export is_core_convertible
+      export is_reference_wrapper
+      export is_void
+      export remove_cv
+    }
     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_always_bitcastable                     { private header "__type_traits/is_always_bitcastable.h" }
     module is_arithmetic {
       private header "__type_traits/is_arithmetic.h"
       export integral_constant
     }
     module is_array                                  {
       private header "__type_traits/is_array.h"
       export integral_constant
     }
     module is_assignable                             { private header "__type_traits/is_assignable.h" }
     module is_base_of                                { private header "__type_traits/is_base_of.h" }
     module is_bounded_array                          { private header "__type_traits/is_bounded_array.h" }
     module is_callable                               { private header "__type_traits/is_callable.h" }
     module is_char_like_type                         { private header "__type_traits/is_char_like_type.h" }
     module is_class                                  { private header "__type_traits/is_class.h" }
     module is_compound                               { private header "__type_traits/is_compound.h" }
     module is_const                                  { private header "__type_traits/is_const.h" }
     module is_constant_evaluated                     { private header "__type_traits/is_constant_evaluated.h" }
     module is_constructible                          { private header "__type_traits/is_constructible.h" }
-    module is_convertible                            { private header "__type_traits/is_convertible.h" }
+    module is_convertible                            {
+      private header "__type_traits/is_convertible.h"
+      export is_array
+    }
     module is_copy_assignable                        { private header "__type_traits/is_copy_assignable.h" }
     module is_copy_constructible                     { private header "__type_traits/is_copy_constructible.h" }
     module is_core_convertible                       {
       private header "__type_traits/is_core_convertible.h"
       export integral_constant
     }
     module is_default_constructible                  { private header "__type_traits/is_default_constructible.h" }
     module is_destructible                           { private header "__type_traits/is_destructible.h" }
module type_traits {
     module is_move_assignable                        { private header "__type_traits/is_move_assignable.h" }
     module is_move_constructible                     { private header "__type_traits/is_move_constructible.h" }
     module is_nothrow_assignable                     { private header "__type_traits/is_nothrow_assignable.h" }
     module is_nothrow_constructible                  { private header "__type_traits/is_nothrow_constructible.h" }
     module is_nothrow_convertible                    { private header "__type_traits/is_nothrow_convertible.h" }
     module is_nothrow_copy_assignable                { private header "__type_traits/is_nothrow_copy_assignable.h" }
     module is_nothrow_copy_constructible             { private header "__type_traits/is_nothrow_copy_constructible.h" }
     module is_nothrow_default_constructible          { private header "__type_traits/is_nothrow_default_constructible.h" }
-    module is_nothrow_destructible                   { private header "__type_traits/is_nothrow_destructible.h" }
+    module is_nothrow_destructible                   {
+      private header "__type_traits/is_nothrow_destructible.h"
+      export type_traits.is_destructible
+    }
     module is_nothrow_move_assignable                { private header "__type_traits/is_nothrow_move_assignable.h" }
-    module is_nothrow_move_constructible             { private header "__type_traits/is_nothrow_move_constructible.h" }
-    module is_null_pointer                           { private header "__type_traits/is_null_pointer.h" }
-    module is_object                                 { private header "__type_traits/is_object.h" }
+    module is_nothrow_move_constructible             {
+      private header "__type_traits/is_nothrow_move_constructible.h"
+      export type_traits.is_nothrow_constructible
+    }
+    module is_null_pointer                           {
+      private header "__type_traits/is_null_pointer.h"
+      export compat.cstddef
+    }
+    module is_object                                 {
+      private header "__type_traits/is_object.h"
+      export type_traits.is_scalar
+    }
     module is_pod                                    { private header "__type_traits/is_pod.h" }
     module is_pointer                                { private header "__type_traits/is_pointer.h" }
     module is_polymorphic                            { private header "__type_traits/is_polymorphic.h" }
-    module is_primary_template                       { private header "__type_traits/is_primary_template.h" }
+    module is_primary_template                       {
+      private header "__type_traits/is_primary_template.h"
+      export type_traits.enable_if
+    }
     module is_reference                              { private header "__type_traits/is_reference.h" }
     module is_reference_wrapper                      { private header "__type_traits/is_reference_wrapper.h" }
     module is_referenceable                          { private header "__type_traits/is_referenceable.h" }
     module is_same                                   {
       private header "__type_traits/is_same.h"
       export type_traits.integral_constant
     }
-    module is_scalar                                 { private header "__type_traits/is_scalar.h" }
+    module is_scalar                                 {
+      private header "__type_traits/is_scalar.h"
+      export type_traits.is_null_pointer
+    }
     module is_scoped_enum                            { private header "__type_traits/is_scoped_enum.h" }
     module is_signed                                 { private header "__type_traits/is_signed.h" }
     module is_signed_integer                         { private header "__type_traits/is_signed_integer.h" }
     module is_specialization                         { private header "__type_traits/is_specialization.h" }
     module is_standard_layout                        { private header "__type_traits/is_standard_layout.h" }
-    module is_swappable                              { private header "__type_traits/is_swappable.h" }
+    module is_swappable                              {
+      private header "__type_traits/is_swappable.h"
+      export type_traits.is_move_constructible
+    }
     module is_trivial                                { private header "__type_traits/is_trivial.h" }
     module is_trivially_assignable                   { private header "__type_traits/is_trivially_assignable.h" }
     module is_trivially_constructible                { private header "__type_traits/is_trivially_constructible.h" }
     module is_trivially_copy_assignable              { private header "__type_traits/is_trivially_copy_assignable.h" }
     module is_trivially_copy_constructible           { private header "__type_traits/is_trivially_copy_constructible.h" }
     module is_trivially_copyable                     { private header "__type_traits/is_trivially_copyable.h" }
     module is_trivially_default_constructible        { private header "__type_traits/is_trivially_default_constructible.h" }
     module is_trivially_destructible                 { private header "__type_traits/is_trivially_destructible.h" }
module is_void                                   {
       private header "__type_traits/is_void.h"
       export integral_constant
     }
     module is_volatile                               { private header "__type_traits/is_volatile.h" }
     module lazy                                      { private header "__type_traits/lazy.h" }
     module make_32_64_or_128_bit                     { private header "__type_traits/make_32_64_or_128_bit.h" }
     module make_const_lvalue_ref                     { private header "__type_traits/make_const_lvalue_ref.h" }
     module make_signed                               { private header "__type_traits/make_signed.h" }
-    module make_unsigned                             { private header "__type_traits/make_unsigned.h" }
+    module make_unsigned                             {
+      private header "__type_traits/make_unsigned.h"
+      export type_traits.is_unsigned
+    }
     module maybe_const                               { private header "__type_traits/maybe_const.h" }
     module nat                                       { private header "__type_traits/nat.h" }
     module negation                                  { private header "__type_traits/negation.h" }
     module noexcept_move_assign_container            { private header "__type_traits/noexcept_move_assign_container.h" }
     module operation_traits                          { private header "__type_traits/operation_traits.h" }
     module predicate_traits                          { private header "__type_traits/predicate_traits.h" }
     module promote                                   { private header "__type_traits/promote.h" }
     module rank                                      { private header "__type_traits/rank.h" }
     module remove_all_extents                        { private header "__type_traits/remove_all_extents.h" }
     module remove_const                              { private header "__type_traits/remove_const.h" }
     module remove_const_ref                          { private header "__type_traits/remove_const_ref.h" }
-    module remove_cv                                 { private header "__type_traits/remove_cv.h" }
+    module remove_cv                                 {
+      private header "__type_traits/remove_cv.h"
+      export type_traits.remove_const
+      export type_traits.remove_volatile
+    }
     module remove_cvref                              { private header "__type_traits/remove_cvref.h" }
     module remove_extent                             { private header "__type_traits/remove_extent.h" }
     module remove_pointer                            { private header "__type_traits/remove_pointer.h" }
     module remove_reference                          { private header "__type_traits/remove_reference.h" }
     module remove_volatile                           { private header "__type_traits/remove_volatile.h" }
     module result_of                                 { private header "__type_traits/result_of.h" }
     module strip_signature                           { private header "__type_traits/strip_signature.h" }
     module type_identity                             { private header "__type_traits/type_identity.h" }
     module type_list                                 { private header "__type_traits/type_list.h" }
     module underlying_type                           {
       private header "__type_traits/underlying_type.h"
-
-      export type_traits
+      export type_traits.is_enum
     }
     module unwrap_ref                                { private header "__type_traits/unwrap_ref.h" }
     module void_t                                    { private header "__type_traits/void_t.h" }
   }
   module typeindex {
     header "typeindex"
     export *
   }
module utility {
     export *
 
     module __utility {
       module as_const               { private header "__utility/as_const.h" }
       module auto_cast              {
         private header "__utility/auto_cast.h"
         export type_traits.decay
       }
-      module cmp                    { private header "__utility/cmp.h" }
+      module cmp                    {
+        private header "__utility/cmp.h"
+        export type_traits.make_unsigned
+      }
       module convert_to_integral    { private header "__utility/convert_to_integral.h" }
       module declval                { private header "__utility/declval.h" }
       module exception_guard        { private header "__utility/exception_guard.h" }
       module exchange               { private header "__utility/exchange.h" }
       module forward                { private header "__utility/forward.h" }
       module forward_like           { private header "__utility/forward_like.h" }
       module in_place               { private header "__utility/in_place.h" }
       module integer_sequence       { private header "__utility/integer_sequence.h" }
       module is_pointer_in_range    { private header "__utility/is_pointer_in_range.h" }
-      module move                   { private header "__utility/move.h" }
-      module pair                   { private header "__utility/pair.h" }
+      module move                   {
+        private header "__utility/move.h"
+        export type_traits.is_copy_constructible
+        export type_traits.is_nothrow_move_constructible
+        export type_traits.remove_reference
+      }
+      module pair                   {
+        private header "__utility/pair.h"
+        export ranges.__ranges.subrange_fwd
+        export type_traits.is_assignable
+        export type_traits.is_constructible
+        export type_traits.is_convertible
+        export type_traits.is_copy_assignable
+        export type_traits.is_move_assignable
+        export type_traits.is_nothrow_copy_constructible
+        export type_traits.is_nothrow_default_constructible
+        export type_traits.is_nothrow_move_assignable
+      }
       module pair_fwd               { private header "__fwd/pair.h" }
       module piecewise_construct    { private header "__utility/piecewise_construct.h" }
       module priority_tag           { private header "__utility/priority_tag.h" }
       module rel_ops                { private header "__utility/rel_ops.h" }
-      module swap                   { private header "__utility/swap.h" }
+      module swap                   {
+        private header "__utility/swap.h"
+        export type_traits.is_swappable
+      }
       module terminate_on_exception { private header "__utility/terminate_on_exception.h" }
       module to_underlying          { private header "__utility/to_underlying.h" }
       module unreachable            { private header "__utility/unreachable.h" }
     }
   }
   module valarray {
     header "valarray"
     export initializer_list

libcxx/utils/find_transitive_includes.py

+#===----------------------------------------------------------------------===##
+#
+# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+#===----------------------------------------------------------------------===##
+
+import argparse
+import os
+import subprocess
+import tempfile
+import typing
+
+# Finds include paths to a header that are present in all C++ versions.
+def main() -> None:
+    parser = argparse.ArgumentParser()
+    source_group = parser.add_mutually_exclusive_group(required=True)
+    source_group.add_argument('--source-file')
+    source_group.add_argument('--start-header')
+    parser.add_argument('--header', required=True)
+    parser.add_argument('--libcxx-include-directory', required=True)
+    parser.add_argument('--libcxx-include-target-directory')
+    parser.add_argument('--cxx-compiler', required=True)
+    parser.add_argument('--target')
+    parser.add_argument('--isysroot')
+    args = parser.parse_args()
+
+    source_file_path = args.source_file
+    delete_source = False
+    if args.start_header:
+        with tempfile.NamedTemporaryFile(mode='w', suffix='.cpp', delete=False) as source_file:
+            source_file.write('#include <')
+            source_file.write(args.start_header)
+            source_file.write('>\n')
+            source_file_path = source_file.name
+        delete_source = True
+
+    direct_includes = build_include_tree(args.cxx_compiler, args.target, args.isysroot, args.libcxx_include_directory, args.libcxx_include_target_directory, source_file_path)
+    if delete_source:
+        os.remove(source_file_path)
+
+    include_paths = find_include_paths(direct_includes, args.header)
+    if args.start_header:
+        print('Include paths from <', args.start_header, '> to <', args.header, '>', sep='')
+    else:
+        print('Include paths from "', args.source_file, '" to <', args.header, '>', sep='')
+    print_include_paths(include_paths)
+
+def build_include_tree(cxx_compiler: str, target: typing.Optional[str], isysroot: typing.Optional[str], libcxx_include_directory: str, libcxx_include_target_directory: typing.Optional[str], source_file_path: str) -> set['Header']:
+    headers = None # header objects keyed by path
+    direct_includes = None # set of the headers directly included by source_file_path
+    # includes vary by standard, so all standards need to be run, and the includes intersected.
+    for standard in ['c++98', 'c++11', 'c++14', 'c++17', 'c++20', 'c++2b']:
+        cxx_command = [cxx_compiler]
+        if target:
+            cxx_command += ['-target', target]
+        if isysroot:
+            cxx_command += ['-isysroot', isysroot]
+        cxx_command += ['-E', '-H', '-fshow-skipped-includes']
+        cxx_command.append('-std=' + standard)
+        cxx_command.append('-nostdinc++')
+        cxx_command += ['-cxx-isystem', libcxx_include_directory]
+        if libcxx_include_target_directory:
+            cxx_command += ['-cxx-isystem', libcxx_include_target_directory]
+        cxx_command.append('-w')
+        cxx_command.append(source_file_path)
+
+        # Don't require the command to succeed, some of the unit test sources will fail for C++98/C++03.
+        # It should be fine, they include the libc++ headers first and the necessary output is still produced.
+        includes = subprocess.run(cxx_command, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE, text=True).stderr
+
+        # Consider 'a' that includes 'b' and 'c', 'b' that includes 'c', and 'c' that includes
+        # nothing. All three headers have header guards. For an input file that includes all three,
+        # -H -fshow-skipped-includes will look like this.
+        # . /a
+        # .. /b
+        # ... /c
+        # .. /c
+        # . /b
+        # . /c
+        # The last three lines are skipped includes - a's include of c is skipped because c has already
+        # been seen via b, and same with the input file's includes of b and c that have already been seen
+        # via a and b. Skipped includes do not re-list any of their includes, which is why there isn't a
+        # ".. /c" under ". /b". The first time a header is seen, it will show all of its direct includes
+        # and potentially some of its transitive includes. Headers without header guards are not skipped,
+        # and can have different includes depending on the context.
+        header_stack = [] # list of tuples (level, path)
+        current_headers = {} # header objects keyed by path
+        current_direct_includes = set()
+        for line in includes.splitlines():
+            if not line.startswith('.'):
+                continue
+
+            dots, include = line.split(' ', maxsplit=1)
+            level = len(dots)
+            current_header = current_headers.setdefault(include, Header(include, libcxx_include_directory))
+
+            while header_stack and (level <= header_stack[-1][0]):
+                del header_stack[-1]
+
+            if header_stack:
+                parent_header = header_stack[-1][1]
+                parent_header.included_headers.add(current_header)
+
+            header_stack.append((level, current_header))
+            if level == 1:
+                current_direct_includes.add(current_header)
+
+        if not headers:
+            headers = current_headers
+        else:
+            # The goal of this script is to find include paths from the source to the
+            # target header that are present in all configurations so that the appropriate
+            # `export` statements can be added to the module map. Intersect the includes
+            # from all of the standards so that the export chains will make the connection
+            # in all standard versions.
+            for path, current_header in current_headers.items():
+                matching_header = headers.get(path)
+                if matching_header:
+                    matching_header.included_headers &= current_header.included_headers
+            
+        if not direct_includes:
+            direct_includes = current_direct_includes
+        else:
+            direct_includes &= current_direct_includes
+
+    return direct_includes
+
+def find_include_paths(direct_includes: set['Header'], header: str) -> list[tuple['Header']]:
+    include_paths = []
+    headers_to_ignore = set()
+    for direct_include in direct_includes:
+        includes = direct_include.included_headers
+        includes_to_follow = [includes.copy()] if includes else []
+        include_path = [direct_include]
+        
+        while includes_to_follow:
+            selected_header = includes_to_follow[-1].pop()
+            include_path.append(selected_header)
+
+            selected_header_includes_to_follow = {}
+            if selected_header.libxcxx_include_relative_path == header:
+                include_paths.append(tuple(include_path))
+            else:
+                selected_header_includes = selected_header.included_headers
+                selected_header_includes_to_follow = selected_header_includes.difference(include_path) - headers_to_ignore
+                if not selected_header_includes_to_follow:
+                    # 1. This header has no includes.
+                    # 2. This header only includes things that are already in the current
+                    #    include path (i.e. cyclical includes)
+                    # Add the header to the list of headers that can be ignored from now
+                    # on.
+                    # 3. If a later header only includes ignored headers, then the later
+                    #    header can also be ignored.
+                    headers_to_ignore.add(selected_header)
+
+            if selected_header_includes_to_follow:
+                includes_to_follow.append(selected_header_includes_to_follow)
+            else:
+                # Hit the end of the include path, peel back a level.
+                del include_path[-1]
+
+                # Peel back the completed levels.
+                while includes_to_follow and not includes_to_follow[-1]:
+                    del includes_to_follow[-1]
+                    del include_path[-1]
+    return include_paths
+
+def print_include_paths(include_paths: list[tuple['Header']]) -> None:
+    def include_path_sort_key(include_path: tuple['Header']) -> tuple[int, tuple['Header']]:
+        # This script is intended to add module exports to mirror includes, usually
+        # to bridge from one private header to another. Prefer the path with the least
+        # number of public headers so that private headers don't export a large API
+        # surface. Then prefer the shortest path to add the minimum number of exports,
+        # and finally fall back on a regular sort.
+        public_header_count = 0
+        for header in include_path:
+            if not header.is_private_libcxx_header:
+                public_header_count += 1
+        return (public_header_count, len(include_path), include_path)
+
+    for include_path in sorted(include_paths, key=include_path_sort_key):
+        for include in include_path:
+            if include.is_libxx_header:
+                print(include.libxcxx_include_relative_path)
+            else:
+                print(include.path)
+        print()
+
+class Header:
+    def __init__(self, path: str, libcxx_include_directory: str) -> None:
+        self.path = path
+        if os.path.commonpath([path, libcxx_include_directory]) == libcxx_include_directory:
+            self.is_libxx_header = True
+            self.libxcxx_include_relative_path = os.path.relpath(path, libcxx_include_directory)
+            self.is_private_libcxx_header = self.libxcxx_include_relative_path.startswith('__')
+        else:
+            self.is_libxx_header = False
+            self.libxcxx_include_relative_path = ''
+            self.is_private_libcxx_header = False
+
+        self.included_headers = set()
+
+    def __repr__(self) -> str:
+        return f'<{type(self).__name__} {self.path}>'
+
+    def __hash__(self) -> int:
+        return hash(self.path)
+
+    def __eq__(self, other) -> bool:
+        return self.path == other.path
+
+    def __ne__(self, other) -> bool:
+        return self.path != other.path
+
+    def __lt__(self, other) -> bool:
+        return self.path < other.path
+
+    def __le__(self, other) -> bool:
+        return self.path <= other.path
+
+    def __gt__(self, other) -> bool:
+        return self.path > other.path
+
+    def __ge__(self, other) -> bool:
+        return self.path >= other.path
+
+main()