Revert "Revert "[libcxx][module-map] creates submodules for private headers""

[cjdb]

Summary

This reverts commit d9633f229c36f292dab0e5f510ac635cfaf3a798 as a
workaround was discovered.

[cjdb]

adds missing inclusion (not reproing locally for some reason)

[cjdb]

another failure not caught locally

[cjdb]

another failure not caught locally (not sure what's going on there)

[cjdb]

Finally managed to repro test failures locally. Still not confident this will pass: building with modules seemed to segfault, but it was also segfaulting when compiling vanilla ToT.

[cjdb]

Uncomments code that was commented out for debugging (tonight's not my night).

[cjdb]

rebases to activate CI

[cjdb]

rebases to activate CI (runtimes build expected to fail since the addressof operator hasn't been moved around yet)

[cjdb]

moves addressof operator deletion

[cjdb]

adds addressof operators back, turns on XFAILs

[ldionne]

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/special_function.compile.pass.cpp

12

Those should be

// XFAIL: clang-11 && modules-build
// XFAIL: clang-12 && modules-build

[cjdb]

corrects XFAILs

[cjdb]

fixes test case that was failing

[cjdb]

fixes build failure

libcxx/include/module.modulemap

module std [system] {
   }
   module filesystem {
     header "filesystem"
     export *
   }
   module format {
     header "format"
     export *
+
+    module __format {
+      module format_error         { header "__format/format_error.h"         }
+      module format_parse_context { header "__format/format_parse_context.h" }
+    }
   }
   module forward_list {
     header "forward_list"
     export initializer_list
     export *
   }
   module fstream {
     header "fstream"
module std [system] {
   module istream {
     header "istream"
     // FIXME: should re-export ios, streambuf?
     export *
   }
   module iterator {
     header "iterator"
     export *
+
+    module __iterator {
+      module advance              { header "__iterator/advance.h"              }
+      module concepts             { header "__iterator/concepts.h"             }
+      module default_sentinel     { header "__iterator/default_sentinel.h"     }
+      module incrementable_traits { header "__iterator/incrementable_traits.h" }
+      module iter_move            { header "__iterator/iter_move.h"            }
+      module iterator_traits      { header "__iterator/iterator_traits.h"      }
+      module next                 { header "__iterator/next.h"                 }
+      module prev                 { header "__iterator/prev.h"                 }
+      module projected            { header "__iterator/projected.h"            }
+      module readable_traits      { header "__iterator/readable_traits.h"      }
+    }
   }
   module latch {
     requires cplusplus14
     header "latch"
     export *
   }
   module limits {
     header "limits"
module std [system] {
   module map {
     header "map"
     export initializer_list
     export *
   }
   module memory {
     header "memory"
     export *
+
+    module __memory {
+      module addressof                { header "__memory/addressof.h"                }
+      module allocation_guard         { header "__memory/allocation_guard.h"         }
+      module allocator_traits         { header "__memory/allocator_traits.h"         }
+      module allocator                { header "__memory/allocator.h"                }
+      module auto_ptr                 { header "__memory/auto_ptr.h"                 }
+      module compressed_pair          { header "__memory/compressed_pair.h"          }
+      module construct_at             { header "__memory/construct_at.h"             }
+      module pointer_safety           { header "__memory/pointer_safety.h"           }
+      module pointer_traits           { header "__memory/pointer_traits.h"           }
+      module raw_storage_iterator     { header "__memory/raw_storage_iterator.h"     }
+      module shared_ptr               { header "__memory/shared_ptr.h"               }
+      module temporary_buffer         { header "__memory/temporary_buffer.h"         }
+      module uninitialized_algorithms { header "__memory/uninitialized_algorithms.h" }
+      module unique_ptr               { header "__memory/unique_ptr.h"               }
+    }
   }
   module mutex {
     header "mutex"
     export *
   }
   module new {
     header "new"
     export *
module random {
     export *
   }
   module ranges {
     header "ranges"
     export compare
     export initializer_list
     export iterator
     export *
+
+    module __ranges {
+      module access                 { header "__ranges/access.h"                 }
+      module concepts               { header "__ranges/concepts.h"               }
+      module data                   { header "__ranges/data.h"                   }
+      module empty                  { header "__ranges/empty.h"                  }
+      module enable_borrowed_range  { header "__ranges/enable_borrowed_range.h"  }
+      module enable_view            { header "__ranges/enable_view.h"            }
+      module size                   { header "__ranges/size.h"                   }
+      module view_interface         { header "__ranges/view_interface.h"         }
+    }
   }
   module ratio {
     header "ratio"
     export *
   }
   module regex {
     header "regex"
     export initializer_list
module unordered_set {
     header "unordered_set"
     export initializer_list
     export *
   }
   module utility {
     header "utility"
     export initializer_list
     export *
+
+    module __utility {
+      module to_underlying {
+        header "__utility/to_underlying.h"
+      }
+    }
   }
   module valarray {
     header "valarray"
     export initializer_list
     export *
   }
   module variant {
     header "variant"
     export *
   }
   module vector {
     header "vector"
     export initializer_list
     export *
   }
   module version {
     header "version"
     export *
   }
 
+  // __config not modularised due to a bug in Clang
+  // __functional(_03)?_base not modularised since it's designed for textual inclusion
+  // libcpp_version not modularised since it's just a version number
   // FIXME: These should be private.
-  module __bit_reference { header "__bit_reference" export * }
-  module __bits { header "__bits" export * }
-  module __debug { header "__debug" export * }
-  module __errc { header "__errc" export * }
-  module __functional_base { header "__functional_base" export * }
-  module __hash_table { header "__hash_table" export * }
-  module __locale { header "__locale" export * }
-  module __mutex_base { header "__mutex_base" export * }
-  module __node_handle { header "__node_handle" export * }
-  module __split_buffer { header "__split_buffer" export * }
-  module __std_stream { header "__std_stream" export * }
-  module __string { header "__string" export * }
+  module __availability      { header "__availability"      export * }
+  module __bit_reference     { header "__bit_reference"     export * }
+  module __bits              { header "__bits"              export * }
+  module __debug             { header "__debug"             export * }
+  module __errc              { header "__errc"              export * }
+  module __function_like     { header "__function_like.h"   export * }
+  module __functional_base   { header "__functional_base"   export * }
+  module __hash_table        { header "__hash_table"        export * }
+  module __locale            { header "__locale"            export * }
+  module __mutex_base        { header "__mutex_base"        export * }
+  module __node_handle       { header "__node_handle"       export * }
+  module __nullptr           { header "__nullptr"           export * }
+  module __split_buffer      { header "__split_buffer"      export * }
+  module __std_stream        { header "__std_stream"        export * }
+  module __string            { header "__string"            export * }
   module __threading_support { header "__threading_support" export * }
-  module __tree { header "__tree" export * }
-  module __tuple { header "__tuple" export * }
-  module __undef_macros { header "__undef_macros" export * }
+  module __tree              { header "__tree"              export * }
+  module __tuple             { header "__tuple"             export * }
+  module __undef_macros      { header "__undef_macros"      export * }
 
   module experimental {
     requires cplusplus11
 
     module algorithm {
       header "experimental/algorithm"
       export *
     }

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_count.pass.cpp

 
 // ranges::advance(it, n)
 
 #include <iterator>
 
 #include <array>
 #include <cassert>
 
-#include "test_standard_function.h"
 #include "test_iterators.h"
 
-static_assert(is_function_like<decltype(std::ranges::advance)>());
-
 using range_t = std::array<int, 10>;
 
 template <std::input_or_output_iterator It>
 constexpr void check_move_forward(std::ptrdiff_t const n) {
   auto range = range_t{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
   auto first = stride_counting_iterator(It(range.begin()));
   std::ranges::advance(first, n);
 

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_count_sentinel.pass.cpp

 
 // ranges::advance(it, n, sent)
 
 #include <iterator>
 
 #include <array>
 #include <cassert>
 
-#include "test_standard_function.h"
 #include "test_iterators.h"
 
-static_assert(is_function_like<decltype(std::ranges::advance)>());
-
 using range_t = std::array<int, 10>;
 
 class distance_apriori_sentinel {
 public:
   distance_apriori_sentinel() = default;
   constexpr explicit distance_apriori_sentinel(std::ptrdiff_t const count) : count_(count) {}
 
   constexpr bool operator==(std::input_or_output_iterator auto const&) const {

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_sentinel.pass.cpp

 
 // ranges::advance(it, sent)
 
 #include <iterator>
 
 #include <array>
 #include <cassert>
 
-#include "test_standard_function.h"
 #include "test_iterators.h"
 
-static_assert(is_function_like<decltype(std::ranges::advance)>());
-
 using range_t = std::array<int, 10>;
 
 class distance_apriori_sentinel {
 public:
   distance_apriori_sentinel() = default;
   constexpr explicit distance_apriori_sentinel(std::ptrdiff_t const count) : count_(count) {}
 
   constexpr bool operator==(std::input_or_output_iterator auto const&) const {

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/special_function.compile.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
 // UNSUPPORTED: libcpp-no-concepts
 // UNSUPPORTED: gcc-10
+// XFAIL: clang-11 && modules-build
+// XFAIL: clang-12 && modules-build
 
 // ranges::advance
 
 #include <iterator>
 
+#include "test_standard_function.h"
+
+static_assert(is_function_like<decltype(std::ranges::advance)>());
+
 // FIXME: We're bending the rules here by adding a new type to namespace std::ranges. Since this is
 // the standard library's test suite, this should be fine (we *are* the implementation), but it's
 // necessary at the time of writing since there aren't any iterators in std::ranges that we can
 // borrow for this test.
 namespace std::ranges {
 class fake_forward_iterator {
 public:
   using value_type = int;

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/special_function.compile.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
 // UNSUPPORTED: libcpp-no-concepts
 // UNSUPPORTED: gcc-10
+// XFAIL: clang-11 && modules-build
+// XFAIL: clang-12 && modules-build
 
 // ranges::next
 
 #include <iterator>
 
 #include "test_standard_function.h"
 
 static_assert(is_function_like<decltype(std::ranges::next)>());

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.prev/special_function.compile.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
 // UNSUPPORTED: libcpp-no-concepts
 // UNSUPPORTED: gcc-10
+// XFAIL: clang-11 && modules-build
+// XFAIL: clang-12 && modules-build
 
 // ranges::prev
 
 #include <iterator>
 
 #include "test_iterators.h"
 #include "test_standard_function.h"