[libc++][Modules] Add missing submodules

[iana]

Summary

Several headers that are included by the modular headers are missing from the module map, add those in.
The either/or implementation headers <__algorithm/pstl_backends/cpu_backends/serial.h>/<__algorithm/pstl_backends/cpu_backends/thread.h> need to be textual, as does <__undef_macros>.

[iana]

Reordering in the stack

[iana]

Rebase

[iana]

Rebase

[iana]

Reordering in the stack and adding comments to header_information.py

[iana]

Add new pstl headers.

[iana]

Add a missing include and export

[iana]

Add a missing export

[iana]

The __local_dir headers go with <locale> and should be in its module

[iana]

libcxx/include/__algorithm/pstl_replace.h

15

This include is necessary once pstl_replace.h gets a module because pstl_transform.h isn't even transitively included from this file. It works as a textual header only if the included includes pstl_transform.h first, but as a modular header it requires the include.

15

only if the *includer* includes pstl_transform.h

[iana]

Rebase

[iana]

Rebase

[iana]

Rebase

[iana]

Rebase

[iana]

Rebase

[ldionne]

libcxx/utils/libcxx/test/header_information.py

73–86

What happens if you just drop this diff entirely? Does libcxx/test/libcxx/private_headers.gen.py start failing (and how)?

[iana]

Try without changing header_information.py

[iana]

libcxx/utils/libcxx/test/header_information.py

73–86

Let me see, it was originally failing with __iterator/readable_traits.h on an earlier version of the stack and I just added these later.

[iana]

Restore the changes to header_information.py, but pare it down to just the headers that newly got modules and aren't standalone.

[iana]

Rebase

libcxx/include/__algorithm/pstl_replace.h

 //===----------------------------------------------------------------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef _LIBCPP___ALGORITHM_PSTL_REPLACE_H
 #define _LIBCPP___ALGORITHM_PSTL_REPLACE_H
 
 #include <__algorithm/pstl_backend.h>
 #include <__algorithm/pstl_for_each.h>
 #include <__algorithm/pstl_frontend_dispatch.h>
+#include <__algorithm/pstl_transform.h>
 #include <__config>
 #include <__iterator/iterator_traits.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/remove_cvref.h>
 #include <__utility/move.h>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

libcxx/include/module.modulemap.in

module depr [extern_c] {
     module errno_h {
       header "errno.h"
       export *
     }
     module fenv_h {
       header "fenv.h"
       export *
     }
-    // <float.h> provided by compiler or C library.
+    module float_t {
+      header "float.h"
+      export *
+    }
     module inttypes_h {
       header "inttypes.h"
       export stdint_h
       export *
     }
     // <iso646.h> provided by compiler.
-    // <limits.h> provided by compiler or C library.
+    module limits_h {
+      header "limits.h"
+      export *
+    }
     module locale_h {
       @requires_LIBCXX_ENABLE_LOCALIZATION@
       header "locale.h"
       export *
     }
     module math_h {
       header "math.h"
       export *
module __algorithm {
       }
       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 find                            {
+        private header "__algorithm/find.h"
+        export algorithm.__algorithm.unwrap_iter
+      }
       module find_end                        { private header "__algorithm/find_end.h" }
       module find_first_of                   { private header "__algorithm/find_first_of.h" }
       module find_if                         { private header "__algorithm/find_if.h" }
       module find_if_not                     { private header "__algorithm/find_if_not.h" }
       module for_each                        { private header "__algorithm/for_each.h" }
       module for_each_n                      { private header "__algorithm/for_each_n.h" }
       module for_each_segment                { private header "__algorithm/for_each_segment.h" }
       module generate                        { private header "__algorithm/generate.h" }
module __algorithm {
       module nth_element                     { private header "__algorithm/nth_element.h" }
       module partial_sort                    { private header "__algorithm/partial_sort.h" }
       module partial_sort_copy               { private header "__algorithm/partial_sort_copy.h" }
       module partition                       { private header "__algorithm/partition.h" }
       module partition_copy                  { private header "__algorithm/partition_copy.h" }
       module partition_point                 { private header "__algorithm/partition_point.h" }
       module pop_heap                        { private header "__algorithm/pop_heap.h" }
       module prev_permutation                { private header "__algorithm/prev_permutation.h" }
+      module pstl_any_all_none_of            { private header "__algorithm/pstl_any_all_none_of.h" }
+      module pstl_backend                    {
+        private header "__algorithm/pstl_backend.h"
+        export *
+      }
       module pstl_backends_cpu_backend       {
         private header "__algorithm/pstl_backends/cpu_backend.h"
         export *
       }
       module pstl_backends_cpu_backends_any_of {
         private header "__algorithm/pstl_backends/cpu_backends/any_of.h"
       }
       module pstl_backends_cpu_backends_backend {
         private header "__algorithm/pstl_backends/cpu_backends/backend.h"
         export *
       }
       module pstl_backends_cpu_backends_fill { private header "__algorithm/pstl_backends/cpu_backends/fill.h" }
       module pstl_backends_cpu_backends_find_if {
         private header "__algorithm/pstl_backends/cpu_backends/find_if.h"
       }
       module pstl_backends_cpu_backends_for_each {
         private header "__algorithm/pstl_backends/cpu_backends/for_each.h"
       }
       module pstl_backends_cpu_backends_merge {
         private header "__algorithm/pstl_backends/cpu_backends/merge.h"
       }
       module pstl_backends_cpu_backends_serial {
-        private header "__algorithm/pstl_backends/cpu_backends/serial.h"
+        private textual header "__algorithm/pstl_backends/cpu_backends/serial.h"
       }
       module pstl_backends_cpu_backends_stable_sort {
         private header "__algorithm/pstl_backends/cpu_backends/stable_sort.h"
       }
       module pstl_backends_cpu_backends_thread {
-        private header "__algorithm/pstl_backends/cpu_backends/thread.h"
+        private textual header "__algorithm/pstl_backends/cpu_backends/thread.h"
       }
       module pstl_backends_cpu_backends_transform {
         private header "__algorithm/pstl_backends/cpu_backends/transform.h"
       }
       module pstl_backends_cpu_backends_transform_reduce {
         private header "__algorithm/pstl_backends/cpu_backends/transform_reduce.h"
       }
+      module pstl_copy                       { private header "__algorithm/pstl_copy.h" }
+      module pstl_count                      { private header "__algorithm/pstl_count.h" }
+      module pstl_fill                       { private header "__algorithm/pstl_fill.h" }
+      module pstl_find                       {
+        private header "__algorithm/pstl_find.h"
+        export *
+      }
+      module pstl_for_each                   {
+        private header "__algorithm/pstl_for_each.h"
+        export algorithm.__algorithm.pstl_backend
+        export iterator.__iterator.iterator_traits
+      }
+      module pstl_frontend_dispatch          {
+        private header "__algorithm/pstl_frontend_dispatch.h"
+        export utility.__utility.forward
+      }
+      module pstl_generate                   { private header "__algorithm/pstl_generate.h" }
+      module pstl_is_partitioned             { private header "__algorithm/pstl_is_partitioned.h" }
+      module pstl_merge                      { private header "__algorithm/pstl_merge.h" }
+      module pstl_replace                    { private header "__algorithm/pstl_replace.h" }
+      module pstl_stable_sort                {
+        private header "__algorithm/pstl_stable_sort.h"
+        export functional.__functional.operations
+      }
+      module pstl_transform                  { private header "__algorithm/pstl_transform.h" }
       module push_heap                       { private header "__algorithm/push_heap.h" }
       module ranges_adjacent_find            { private header "__algorithm/ranges_adjacent_find.h" }
       module ranges_all_of                   { private header "__algorithm/ranges_all_of.h" }
       module ranges_any_of                   { private header "__algorithm/ranges_any_of.h" }
       module ranges_binary_search {
         private header "__algorithm/ranges_binary_search.h"
         export functional.__functional.ranges_operations
       }
module list {
     header "list"
     export initializer_list
     export *
   }
   module locale {
     @requires_LIBCXX_ENABLE_LOCALIZATION@
     header "locale"
     export *
+
+    module __locale {
+      module locale_base_api_bsd_locale_defaults  { private textual header "__locale_dir/locale_base_api/bsd_locale_defaults.h" }
+      module locale_base_api_bsd_locale_fallbacks { private textual header "__locale_dir/locale_base_api/bsd_locale_fallbacks.h" }
+      module locale_base_api_locale_guard         { private header "__locale_dir/locale_base_api/locale_guard.h" }
+    }
   }
   module map {
     header "map"
     export initializer_list
     export *
   }
   module mdspan {
     header "mdspan"
module __numeric {
       module adjacent_difference      { private header "__numeric/adjacent_difference.h" }
       module exclusive_scan           { private header "__numeric/exclusive_scan.h" }
       module gcd_lcm                  { private header "__numeric/gcd_lcm.h" }
       module inclusive_scan           { private header "__numeric/inclusive_scan.h" }
       module inner_product            { private header "__numeric/inner_product.h" }
       module iota                     { private header "__numeric/iota.h" }
       module midpoint                 { private header "__numeric/midpoint.h" }
       module partial_sum              { private header "__numeric/partial_sum.h" }
+      module pstl_reduce              { private header "__numeric/pstl_reduce.h" }
+      module pstl_transform_reduce    {
+        private header "__numeric/pstl_transform_reduce.h"
+        export *
+      }
       module reduce                   { private header "__numeric/reduce.h" }
       module transform_exclusive_scan { private header "__numeric/transform_exclusive_scan.h" }
       module transform_inclusive_scan { private header "__numeric/transform_inclusive_scan.h" }
       module transform_reduce         { private header "__numeric/transform_reduce.h" }
     }
   }
   module optional {
     header "optional"
module type_traits {
     module is_enum                                   {
       private header "__type_traits/is_enum.h"
       export integral_constant
     }
     module is_equality_comparable                    {
       private header "__type_traits/is_equality_comparable.h"
       export integral_constant
     }
-    module is_execution_policy                       { private header "__type_traits/is_execution_policy.h" }
+    module is_execution_policy                       {
+      private header "__type_traits/is_execution_policy.h"
+      export type_traits.remove_cvref
+    }
     module is_final                                  { private header "__type_traits/is_final.h" }
     module is_floating_point                         { private header "__type_traits/is_floating_point.h" }
     module is_function                               { private header "__type_traits/is_function.h" }
     module is_fundamental                            { private header "__type_traits/is_fundamental.h" }
     module is_implicitly_default_constructible       { private header "__type_traits/is_implicitly_default_constructible.h" }
     module is_integral                               { private header "__type_traits/is_integral.h" }
     module is_literal_type                           { private header "__type_traits/is_literal_type.h" }
     module is_member_function_pointer                { private header "__type_traits/is_member_function_pointer.h" }
module __locale            {
     private header "__locale" export *
   }
   module __mbstate_t         { private header "__mbstate_t.h"       export * }
   module __node_handle       { private header "__node_handle"       export * }
   module __split_buffer      { private header "__split_buffer"      export * }
   module __std_mbstate_t     { private header "__std_mbstate_t.h"   export * }
   module __threading_support {         header "__threading_support" export * }
   module __tree              {         header "__tree"              export * }
-  module __undef_macros      {         header "__undef_macros"      export * }
+  module __undef_macros      { textual header "__undef_macros"      export * }
   module __verbose_abort     {         header "__verbose_abort"     export * }
 
   // This one needs to appear after __tree to work around issues with modules in Objective-C++ mode.
   module coroutine {
     header "coroutine"
     export compare
     export *
 
module experimental {
     module utility {
       header "experimental/utility"
       export *
     }
     module vector {
       header "experimental/vector"
       export *
     }
+    module __config {
+      private textual header "experimental/__config"
+      export *
+    }
     // FIXME these should be private
     module __memory {
       header "experimental/__memory"
       export *
     }
   } // end experimental
 }

libcxx/utils/libcxx/test/header_information.py

private_headers_still_public_in_modules = [
     "__config_site.in",
     "__hash_table",
     "__threading_support",
     "__tree",
     "__undef_macros",
     "__verbose_abort",
 ]
 
+# Headers that can't be included on their own. Most of these are conceptually
+# part of another header that were split out just for organization, but aren't
+# meant to be included by anything else.
+non_standalone_headers = frozenset((
+    # Alternate implementations for __algorithm/pstl_backends/cpu_backends/backend.h
+    "__algorithm/pstl_backends/cpu_backends/serial.h",
+    "__algorithm/pstl_backends/cpu_backends/thread.h",
+
+    # Alternate implementations for locale.
+    "__locale_dir/locale_base_api/bsd_locale_defaults.h",
+    "__locale_dir/locale_base_api/bsd_locale_fallbacks.h",
+))
+
 # This table was produced manually, by grepping the TeX source of the Standard's
 # library clauses for the string "#include". Each header's synopsis contains
 # explicit "#include" directives for its mandatory inclusions.
 # For example, [algorithm.syn] contains "#include <initializer_list>".
 mandatory_inclusions = {
     "algorithm": ["initializer_list"],
     "array": ["compare", "initializer_list"],
     "bitset": ["iosfwd", "string"],
     "chrono": ["compare"],

 experimental_headers = sorted(
     p.relative_to(include).as_posix() for p in include.glob("experimental/[a-z]*") if is_header(p)
 )
 public_headers = toplevel_headers + experimental_headers
 private_headers = sorted(
     p.relative_to(include).as_posix() for p in include.rglob("*") if is_header(p)
                                                                      and str(p.relative_to(include)).startswith("__")
                                                                      and not p.name.startswith("pstl")
+                                                                     and str(p.relative_to(include)) not in non_standalone_headers
 )