[libc++][C++03] Fix modules

philnik777 · philnik777 · commit b0312015a9f6 · 2025-10-30T12:56:25.000+01:00
diff --git a/libcxx/include/__cxx03/__algorithm/find.h b/libcxx/include/__cxx03/__algorithm/find.h
@@ -20,6 +20,7 @@
 #include <__cxx03/__fwd/bit_reference.h>
 #include <__cxx03/__iterator/segmented_iterator.h>
 #include <__cxx03/__string/constexpr_c_functions.h>
+#include <__cxx03/__type_traits/invoke.h>
 #include <__cxx03/__type_traits/is_integral.h>
 #include <__cxx03/__type_traits/is_same.h>
 #include <__cxx03/__type_traits/is_signed.h>
diff --git a/libcxx/include/__cxx03/__algorithm/is_permutation.h b/libcxx/include/__cxx03/__algorithm/is_permutation.h
@@ -17,6 +17,7 @@
 #include <__cxx03/__iterator/distance.h>
 #include <__cxx03/__iterator/iterator_traits.h>
 #include <__cxx03/__iterator/next.h>
+#include <__cxx03/__type_traits/integral_constant.h>
 #include <__cxx03/__type_traits/invoke.h>
 #include <__cxx03/__type_traits/is_callable.h>
 #include <__cxx03/__utility/move.h>
diff --git a/libcxx/include/__cxx03/__algorithm/sort.h b/libcxx/include/__cxx03/__algorithm/sort.h
@@ -27,6 +27,7 @@
 #include <__cxx03/__iterator/iterator_traits.h>
 #include <__cxx03/__type_traits/conditional.h>
 #include <__cxx03/__type_traits/disjunction.h>
+#include <__cxx03/__type_traits/integral_constant.h>
 #include <__cxx03/__type_traits/is_arithmetic.h>
 #include <__cxx03/__type_traits/is_constant_evaluated.h>
 #include <__cxx03/__utility/move.h>
diff --git a/libcxx/include/__cxx03/__functional/bind.h b/libcxx/include/__cxx03/__functional/bind.h
@@ -13,9 +13,11 @@
 #include <__cxx03/__config>
 #include <__cxx03/__functional/weak_result_type.h>
 #include <__cxx03/__fwd/functional.h>
+#include <__cxx03/__type_traits/conditional.h>
 #include <__cxx03/__type_traits/decay.h>
 #include <__cxx03/__type_traits/invoke.h>
 #include <__cxx03/__type_traits/is_reference_wrapper.h>
+#include <__cxx03/__type_traits/is_same.h>
 #include <__cxx03/__type_traits/is_void.h>
 #include <__cxx03/__type_traits/remove_cvref.h>
 #include <__cxx03/cstddef>
diff --git a/libcxx/include/__cxx03/__random/generate_canonical.h b/libcxx/include/__cxx03/__random/generate_canonical.h
@@ -11,6 +11,7 @@
 
 #include <__cxx03/__config>
 #include <__cxx03/__random/log2.h>
+#include <__cxx03/cstddef>
 #include <__cxx03/cstdint>
 #include <__cxx03/limits>
 
diff --git a/libcxx/include/__cxx03/array b/libcxx/include/__cxx03/array
@@ -135,6 +135,7 @@ template <size_t I, class T, size_t N> const T&& get(const array<T, N>&&) noexce
 #include <__cxx03/__utility/integer_sequence.h>
 #include <__cxx03/__utility/move.h>
 #include <__cxx03/__utility/unreachable.h>
+#include <__cxx03/cstddef>
 #include <__cxx03/stdexcept>
 #include <__cxx03/version>
 
diff --git a/libcxx/include/__cxx03/cmath b/libcxx/include/__cxx03/cmath
@@ -324,9 +324,9 @@ constexpr long double lerp(long double a, long double b, long double t) noexcept
 #include <__cxx03/limits>
 #include <__cxx03/version>
 
-#include <__cxx03/math.h>
+#include <math.h>
 
-#ifndef _LIBCPP___CXX03_MATH_H
+#ifndef _LIBCPP_MATH_H
 #   error <cmath> tried including <math.h> but didn't find libc++'s <math.h> header. \
           This usually means that your header search paths are not configured properly. \
           The header search paths should contain the C++ Standard Library headers before \
diff --git a/libcxx/include/__cxx03/cstring b/libcxx/include/__cxx03/cstring
@@ -59,7 +59,7 @@ size_t strlen(const char* s);
 #include <__cxx03/__config>
 #include <__cxx03/__type_traits/is_constant_evaluated.h>
 
-#include <__cxx03/string.h>
+#include <string.h>
 
 #ifndef _LIBCPP___CXX03_STRING_H
 #   error <cstring> tried including <string.h> but didn't find libc++'s <string.h> header. \
diff --git a/libcxx/include/__cxx03/future b/libcxx/include/__cxx03/future
@@ -384,6 +384,7 @@ template <class R, class Alloc> struct uses_allocator<packaged_task<R>, Alloc>;
 #  include <__cxx03/__system_error/error_code.h>
 #  include <__cxx03/__system_error/error_condition.h>
 #  include <__cxx03/__type_traits/aligned_storage.h>
+#  include <__cxx03/__type_traits/invoke.h>
 #  include <__cxx03/__type_traits/strip_signature.h>
 #  include <__cxx03/__utility/auto_cast.h>
 #  include <__cxx03/__utility/forward.h>
diff --git a/libcxx/include/__cxx03/map b/libcxx/include/__cxx03/map
@@ -584,6 +584,9 @@ erase_if(multimap<Key, T, Compare, Allocator>& c, Predicate pred);  // C++20
 #include <__cxx03/__memory/allocator.h>
 #include <__cxx03/__tree>
 #include <__cxx03/__type_traits/is_allocator.h>
+#include <__cxx03/__type_traits/is_empty.h>
+#include <__cxx03/__type_traits/is_final.h>
+#include <__cxx03/__type_traits/type_identity.h>
 #include <__cxx03/__utility/forward.h>
 #include <__cxx03/__utility/piecewise_construct.h>
 #include <__cxx03/__utility/swap.h>
diff --git a/libcxx/include/__cxx03/module.modulemap b/libcxx/include/__cxx03/module.modulemap
@@ -457,7 +457,7 @@ module cxx03_std_locale_h [system] {
   export *
 }
 module cxx03_std_math_h [system] {
-  header "math.h"
+  textual header "math.h"
   export *
 }
 // <setjmp.h> provided by C library.
@@ -515,48 +515,6 @@ module cxx03_std_wctype_h [system] {
   export *
 }
 
-// Experimental C++ standard library interfaces
-module cxx03_std_experimental [system] {
-  module iterator {
-    header "experimental/iterator"
-    export *
-  }
-  module memory {
-    header "experimental/memory"
-    export *
-  }
-  module propagate_const {
-    header "experimental/propagate_const"
-    export *
-  }
-  module simd {
-    module aligned_tag          { private header "experimental/__simd/aligned_tag.h" }
-    module declaration          { private header "experimental/__simd/declaration.h" }
-    module reference            { private header "experimental/__simd/reference.h" }
-    module scalar               { private header "experimental/__simd/scalar.h" }
-    module simd                 { private header "experimental/__simd/simd.h" }
-    module simd_mask            { private header "experimental/__simd/simd_mask.h" }
-    module traits               { private header "experimental/__simd/traits.h" }
-    module utility              { private header "experimental/__simd/utility.h" }
-    module vec_ext              { private header "experimental/__simd/vec_ext.h" }
-
-    header "experimental/simd"
-    export *
-  }
-  module type_traits {
-    header "experimental/type_traits"
-    export *
-  }
-  module utility {
-    header "experimental/utility"
-    export *
-  }
-  module __config {
-    textual header "experimental/__config"
-    export *
-  }
-}
-
 // Convenience method to get all of the above modules in a single import statement.
 // Importing only the needed modules is likely to be more performant.
 module cxx03_std [system] {
@@ -1109,8 +1067,8 @@ module cxx03_std_private_chrono_formatter              [system] {
 module cxx03_std_private_chrono_hh_mm_ss               [system] { header "__chrono/hh_mm_ss.h" }
 module cxx03_std_private_chrono_high_resolution_clock  [system] {
   header "__chrono/high_resolution_clock.h"
-  export std_private_chrono_steady_clock
-  export std_private_chrono_system_clock
+  export cxx03_std_private_chrono_steady_clock
+  export cxx03_std_private_chrono_system_clock
 }
 module cxx03_std_private_chrono_leap_second            [system] { header "__chrono/leap_second.h" }
 module cxx03_std_private_chrono_literals               [system] { header "__chrono/literals.h" }
@@ -1130,7 +1088,7 @@ module cxx03_std_private_chrono_parser_std_format_spec [system] {
 module cxx03_std_private_chrono_statically_widen       [system] { header "__chrono/statically_widen.h" }
 module cxx03_std_private_chrono_steady_clock           [system] {
   header "__chrono/steady_clock.h"
-  export std_private_chrono_time_point
+  export cxx03_std_private_chrono_time_point
 }
 module cxx03_std_private_chrono_time_zone              [system] {
   header "__chrono/time_zone.h"
@@ -1980,7 +1938,7 @@ module cxx03_std_private_type_traits_is_member_pointer                         [
 module cxx03_std_private_type_traits_is_nothrow_assignable                     [system] { header "__type_traits/is_nothrow_assignable.h" }
 module cxx03_std_private_type_traits_is_nothrow_constructible                  [system] {
   header "__type_traits/is_nothrow_constructible.h"
-  export std_private_type_traits_integral_constant
+  export cxx03_std_private_type_traits_integral_constant
 }
 module cxx03_std_private_type_traits_is_nothrow_convertible                    [system] { header "__type_traits/is_nothrow_convertible.h" }
 module cxx03_std_private_type_traits_is_nothrow_destructible                   [system] {
diff --git a/libcxx/include/__cxx03/set b/libcxx/include/__cxx03/set
@@ -523,6 +523,7 @@ erase_if(multiset<Key, Compare, Allocator>& c, Predicate pred);  // C++20
 #include <__cxx03/__memory/allocator.h>
 #include <__cxx03/__tree>
 #include <__cxx03/__type_traits/is_allocator.h>
+#include <__cxx03/__type_traits/type_identity.h>
 #include <__cxx03/__utility/forward.h>
 #include <__cxx03/version>
 
diff --git a/libcxx/include/__cxx03/string.h b/libcxx/include/__cxx03/string.h
@@ -52,15 +52,12 @@ size_t strlen(const char* s);
 */
 
 #include <__cxx03/__config>
+#include <__cxx03/cstddef>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 
-#if __has_include_next(<string.h>)
-#  include_next <string.h>
-#endif
-
 // MSVCRT, GNU libc and its derivates may already have the correct prototype in
 // <string.h>. This macro can be defined by users if their C library provides
 // the right signature.
diff --git a/libcxx/include/__cxx03/unordered_map b/libcxx/include/__cxx03/unordered_map
@@ -594,6 +594,7 @@ template <class Key, class T, class Hash, class Pred, class Alloc>
 #include <__cxx03/__memory/addressof.h>
 #include <__cxx03/__memory/allocator.h>
 #include <__cxx03/__type_traits/is_allocator.h>
+#include <__cxx03/__type_traits/is_final.h>
 #include <__cxx03/__type_traits/type_identity.h>
 #include <__cxx03/__utility/forward.h>
 #include <__cxx03/stdexcept>
diff --git a/libcxx/include/__cxx03/unordered_set b/libcxx/include/__cxx03/unordered_set
@@ -542,6 +542,7 @@ template <class Value, class Hash, class Pred, class Alloc>
 #include <__cxx03/__memory/addressof.h>
 #include <__cxx03/__memory/allocator.h>
 #include <__cxx03/__type_traits/is_allocator.h>
+#include <__cxx03/__type_traits/type_identity.h>
 #include <__cxx03/__utility/forward.h>
 #include <__cxx03/version>
 
diff --git a/libcxx/include/module.modulemap.in b/libcxx/include/module.modulemap.in
diff --git a/libcxx/include/string.h b/libcxx/include/string.h
diff --git a/libcxx/test/extensions/clang/clang_modules_include.gen.py b/libcxx/test/extensions/clang/clang_modules_include.gen.py
