[libc++] Add __assertion_handler to the modulemap

[ldionne]

That header is generated via CMake, but it is nonetheless present in the final installation, so it should be covered by the modulemap.

rdar://131418726

[llvmbot]

@llvm/pr-subscribers-libcxx

Author: Louis Dionne (ldionne)

Changes

That header is generated via CMake, but it is nonetheless present in the final installation, so it should be covered by the modulemap.

rdar://131418726

---

Full diff: https://github.com/llvm/llvm-project/pull/131031.diff

1 Files Affected:

• (modified) libcxx/include/module.modulemap (+1)

diff --git a/libcxx/include/module.modulemap b/libcxx/include/module.modulemap
index b9964dac84acd..fd87c290406a4 100644
--- a/libcxx/include/module.modulemap
+++ b/libcxx/include/module.modulemap
@@ -2285,6 +2285,7 @@ module std [system] {
   }
   module internal_assert {
     header "__assert"
+    header "__assertion_handler" // Generated via CMake
     export *
   }
 

[ian-twilightcoder]

This should be in a separate submodule - in general each submodule should have only a single header statement, otherwise you "fuse" the two headers. i.e. wherever you have #include <__assertion_handler> it'll also include __assert which is at least unintuitive.

[ldionne]

I had to make the header textual since otherwise I get:

In file included from <...>/include/c++/v1/__algorithm/binary_search.h:13:
  # | <...>/include/c++/v1/__algorithm/comp_ref_type.h:47:5: error: use of undeclared identifier '_LIBCPP_VERBOSE_ABORT'
  # |    47 |     _LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(!__comp_(__l, __r), "Comparator does not induce a strict weak ordering");
  # |       |     ^
  # | <...>/include/c++/v1/__assert:93:71: note: expanded from macro '_LIBCPP_ASSERT_SEMANTIC_REQUIREMENT'
  # |    93 | #  define _LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(expression, message)    _LIBCPP_ASSERT(expression, message)
  # |       |                                                                       ^
  # | <...>/include/c++/v1/__assert:23:10: note: expanded from macro '_LIBCPP_ASSERT'
  # |    23 |        : _LIBCPP_ASSERTION_HANDLER(__FILE__ ":" _LIBCPP_TOSTRING(__LINE__) ": assertion " _LIBCPP_TOSTRING(            \
  # |       |          ^
  # | <...>/include/c++/v1/__assertion_handler:27:46: note: expanded from macro '_LIBCPP_ASSERTION_HANDLER'
  # |    27 | #  define _LIBCPP_ASSERTION_HANDLER(message) _LIBCPP_VERBOSE_ABORT("%s", message)
  # |       |                                              ^
  # | While building module 'std' imported from /__w/llvm-project/llvm-project/libcxx/test/support/check_assertion.h:12:

That's because I would have to export std.verbose_abort from std.assertion_handler -- which I can't do since that header may be provided externally (IOW another header might require an export that's different from std.verbose_abort).

[ian-twilightcoder]

Can we make __assertion_handler's module export * instead? __assertion_handler has declarations in it, and so it shouldn't be textual. (We have this problem with some other headers that we should eventually tackle, but let's not add to the list?)