[libc++][Modules] Remove explicit exports from modules that `export *`

[iana]

Summary

This may be a clang bug, but explicit exports interfere with export *, especially in local submodule visibility mode. For example, exporting depr.stdint_h from cstdint causes std::int32_t to become an "unresolved using declaration" in LSV if cstdint and stdint.h are promoted to top level modules. This was previously worked around by exporting Darwin.C.stdint in depr.stdint_h, but that only works on Apple platforms, and it stops working when cstdint and stdint.h are promoted to top level modules.

Remove all of the explicit export statements in modules that have export *.

[iana]

Reorder in the stack

[iana]

Rebase

[iana]

Reorder this earlier in the stack

[iana]

Rebase

[iana]

Rebase

[iana]

Rebase

[iana]

Rebase

[iana]

Rebase

[iana]

Add a newly needed export

[Mordante]

It seems the CI is happy, so I'm happy. LGTM!

[iana]

The missing export was needed by the previous change in the stack

[iana]

Rebase

[iana]

Rebase

[iana]

Rebase

[iana]

Rebase

[iana]

Rebase

[iana]

Rebase

[iana]

Rebase

[ldionne]

This one looks like a cleanup to me. Thanks!

[iana]

Remove the two reverts from the stack

libcxx/include/module.modulemap.in

module fenv_h {
       export *
     }
     module float_t {
       header "float.h"
       export *
     }
     module inttypes_h {
       header "inttypes.h"
-      export stdint_h
       export *
     }
     // <iso646.h> provided by compiler.
     module limits_h {
       header "limits.h"
       export *
     }
     module locale_h {
module depr [extern_c] {
     module stddef_h {
       // <stddef.h>'s __need_* macros require textual inclusion.
       textual header "stddef.h"
       export *
     }
     module stdint_h {
       header "stdint.h"
       export *
-      // FIXME: This module only exists on OS X and for some reason the
-      // wildcard above doesn't export it. Removing this breaks the tests
-      // for C compatibility headers in C++17 mode with modules enabled.
-      export Darwin.C.stdint
     }
     module stdio_h {
       // <stdio.h>'s __need_* macros require textual inclusion.
       textual header "stdio.h"
       export *
     }
     module stdlib_h {
       // <stdlib.h>'s __need_* macros require textual inclusion.
module wctype_h {
       export *
     }
   }
 
   // <complex.h> and <tgmath.h> are not C headers in any real sense, do not
   // allow their use in extern "C" contexts.
   module complex_h {
     header "complex.h"
-    export ccomplex
     export *
   }
   module tgmath_h {
     header "tgmath.h"
-    export ccomplex
-    export cmath
     export *
   }
 
   // C compatibility headers.
   module compat {
     module cassert {
       // <cassert>'s use of NDEBUG requires textual inclusion.
       textual header "cassert"
     }
     module ccomplex {
       header "ccomplex"
-      export complex
       export *
     }
     module cctype {
       header "cctype"
       export *
     }
     module cerrno {
       header "cerrno"
       export *
     }
     module cfenv {
       header "cfenv"
       export *
     }
     module cfloat {
       header "cfloat"
       export *
     }
     module cinttypes {
       header "cinttypes"
-      export cstdint
       export *
     }
     module ciso646 {
       header "ciso646"
       export *
     }
     module climits {
       header "climits"
module cstdbool {
       export *
     }
     module cstddef {
       header "cstddef"
       export *
     }
     module cstdint {
       header "cstdint"
-      export depr.stdint_h
       export *
     }
     module cstdio {
       header "cstdio"
       export *
     }
     module cstdlib {
       header "cstdlib"
       export *
     }
     module cstring {
       header "cstring"
       export *
     }
     module ctgmath {
       header "ctgmath"
-      export ccomplex
-      export cmath
       export *
     }
     module ctime {
       header "ctime"
       export *
     }
     module cuchar {
       header "cuchar"
       export *
     }
     module cwchar {
       @requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
       header "cwchar"
-      export depr.stdio_h
       export *
     }
     module cwctype {
       @requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
       header "cwctype"
       export *
     }
   }
 
   module algorithm {
     header "algorithm"
-    export initializer_list
     export *
 
     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 algorithm {
     }
   }
   module any {
     header "any"
     export *
   }
   module array {
     header "array"
-    export initializer_list
     export *
 
     module array_fwd { private header "__fwd/array.h" }
   }
   module atomic {
     header "atomic"
     export *
 
module __bit {
       module endian         { private header "__bit/endian.h" }
       module has_single_bit { private header "__bit/has_single_bit.h" }
       module popcount       { private header "__bit/popcount.h" }
       module rotate         { private header "__bit/rotate.h" }
     }
   }
   module bitset {
     header "bitset"
-    export string
-    export iosfwd
     export *
   }
   // No submodule for cassert. It fundamentally needs repeated, textual inclusion.
   module charconv {
     header "charconv"
     export *
 
     module __charconv {
module condition_variable {
     export *
 
     module __condition_variable {
       module condition_variable { private header "__condition_variable/condition_variable.h" }
     }
   }
   module deque {
     header "deque"
-    export initializer_list
     export *
   }
   module exception {
     header "exception"
     export *
 
     module __exception {
       module exception        { private header "__exception/exception.h" }
module __format {
       module range_default_formatter         { private header "__format/range_default_formatter.h" }
       module range_formatter                 { private header "__format/range_formatter.h" }
       module unicode                         { private header "__format/unicode.h" }
       module width_estimation_table          { private header "__format/width_estimation_table.h" }
     }
   }
   module forward_list {
     header "forward_list"
-    export initializer_list
     export *
   }
   module fstream {
     @requires_LIBCXX_ENABLE_LOCALIZATION@
     @requires_LIBCXX_ENABLE_FILESYSTEM@
     header "fstream"
     export *
   }
   module functional {
     header "functional"
-    // the contents of __type_traits/unwrap_ref.h should be available from functional too.
-    export type_traits.unwrap_ref
     export *
 
     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 iomanip {
     @requires_LIBCXX_ENABLE_LOCALIZATION@
     header "iomanip"
     export *
   }
   module ios {
     @requires_LIBCXX_ENABLE_LOCALIZATION@
     header "ios"
-    export iosfwd
     export *
 
     module __ios {
       module fpos { private header "__ios/fpos.h" }
     }
   }
   module iosfwd {
     header "iosfwd"
     export *
     module __iosfwd {
       module fstream_fwd   { private header "__fwd/fstream.h" }
       module ios_fwd       { private header "__fwd/ios.h" }
       module istream_fwd   { private header "__fwd/istream.h" }
       module ostream_fwd   { private header "__fwd/ostream.h" }
       module sstream_fwd   { private header "__fwd/sstream.h" }
       module streambuf_fwd { private header "__fwd/streambuf.h" }
     }
   }
   module iostream {
     @requires_LIBCXX_ENABLE_LOCALIZATION@
     header "iostream"
-    export ios
-    export streambuf
-    export istream
-    export ostream
     export *
   }
   module istream {
     @requires_LIBCXX_ENABLE_LOCALIZATION@
     header "istream"
     // FIXME: should re-export ios, streambuf?
     export *
   }

   }
 
   module limits {
     header "limits"
     export *
   }
   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"
-    export array
-    export span
     export *
 
     module __mdspan {
       module extents                         { private header "__mdspan/extents.h" }
     }
   }
   module memory {
     header "memory"

   module ostream {
     @requires_LIBCXX_ENABLE_LOCALIZATION@
     header "ostream"
     // FIXME: should re-export ios, streambuf?
     export *
   }
   module queue {
     header "queue"
-    export initializer_list
     export *
   }
   module random {
     header "random"
-    export initializer_list
     export *
 
     module __random {
       module bernoulli_distribution          { private header "__random/bernoulli_distribution.h" }
       module binomial_distribution           { private header "__random/binomial_distribution.h" }
       module cauchy_distribution             { private header "__random/cauchy_distribution.h" }
       module chi_squared_distribution        { private header "__random/chi_squared_distribution.h" }
       module clamp_to_integral               { private header "__random/clamp_to_integral.h" }
module __random {
       module uniform_int_distribution        { private header "__random/uniform_int_distribution.h" }
       module uniform_random_bit_generator    { private header "__random/uniform_random_bit_generator.h" }
       module uniform_real_distribution       { private header "__random/uniform_real_distribution.h" }
       module weibull_distribution            { private header "__random/weibull_distribution.h" }
     }
   }
   module ranges {
     header "ranges"
-    export compare
-    export initializer_list
-    export iterator
     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 ratio {
     header "ratio"
     export *
   }
   module regex {
     @requires_LIBCXX_ENABLE_LOCALIZATION@
     header "regex"
-    export initializer_list
     export *
   }
   module scoped_allocator {
     header "scoped_allocator"
     export *
   }
   module semaphore {
     @requires_LIBCXX_ENABLE_THREADS@
     header "semaphore"
     export *
   }
   module set {
     header "set"
-    export initializer_list
     export *
   }
   module shared_mutex {
     @requires_LIBCXX_ENABLE_THREADS@
     header "shared_mutex"
     export version
   }
   module source_location {

   module sstream {
     @requires_LIBCXX_ENABLE_LOCALIZATION@
     header "sstream"
     // FIXME: should re-export istream, ostream, ios, streambuf, string?
     export *
   }
   module stack {
     header "stack"
-    export initializer_list
     export *
   }
   module stdexcept {
     header "stdexcept"
     export *
   }
   module stop_token {
     @requires_LIBCXX_ENABLE_THREADS@

   }
   module streambuf {
     @requires_LIBCXX_ENABLE_LOCALIZATION@
     header "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"
         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 initializer_list
     export *
     module string_view_fwd { private header "__fwd/string_view.h" }
   }
   module strstream {
     @requires_LIBCXX_ENABLE_LOCALIZATION@
     header "strstream"
     export *
   }
module typeindex {
     export *
   }
   module typeinfo {
     header "typeinfo"
     export *
   }
   module unordered_map {
     header "unordered_map"
-    export initializer_list
     export *
   }
   module unordered_set {
     header "unordered_set"
-    export initializer_list
     export *
   }
   module utility {
     header "utility"
-    export initializer_list
     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 __utility {
       }
       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
     export *
   }
   module variant {
     header "variant"
     export *
 
     module __variant {
       module monostate { private header "__variant/monostate.h" }
     }
   }
   module vector {
     header "vector"
-    export initializer_list
     export *
   }
   module version {
     header "version"
     export *
   }
 
   // FIXME: These should be private.

   module __threading_support {         header "__threading_support" export * }
   module __tree              {         header "__tree"              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 __coroutine {
       module coroutine_handle           { private header "__coroutine/coroutine_handle.h" }
       module coroutine_traits           { private header "__coroutine/coroutine_traits.h" }
       module noop_coroutine_handle      { private header "__coroutine/noop_coroutine_handle.h" }
       module trivial_awaitables         { private header "__coroutine/trivial_awaitables.h" }
     }