commit 2c20cf36ebfa8ef9fb75feb8c477204877395221
author Louis Dionne <ldionne.2@gmail.com> Fri Feb 04 15:37:01 2022 -0500
committer Copybara-Service <copybara-worker@google.com> Tue Feb 08 12:21:35 2022 -0800
tree 08064e3565a05e3e1a9421a5ae005079b4de6732
parent 4917016cfc0ede2cae7895de1fbec91e3e3f31cc

[libc++] Fix modules and benchmarks CI builds when incomplete features are disabled

Differential Revision: https://reviews.llvm.org/D119036

NOKEYCHECK=True
GitOrigin-RevId: 506cf6dc048835c598b654e43ed8f723a42e39ba

include/__debug

diff --git a/include/__debug b/include/__debug
index 43554de..5d0b5bf 100644
--- a/include/__debug
+++ b/include/__debug
@@ -29,10 +29,10 @@
 #   define _LIBCPP_ASSERT_IMPL(x, m) ((void)0)
 #elif _LIBCPP_DEBUG_LEVEL == 1
 #   define _LIBCPP_DEBUG_ASSERT(x, m) ((void)0)
-#   define _LIBCPP_ASSERT_IMPL(x, m) ((x) ? (void)0 : _VSTD::__libcpp_debug_function(_VSTD::__libcpp_debug_info(__FILE__, __LINE__, #x, m)))
+#   define _LIBCPP_ASSERT_IMPL(x, m) ((x) ? (void)0 : ::std::__libcpp_debug_function(::std::__libcpp_debug_info(__FILE__, __LINE__, #x, m)))
 #elif _LIBCPP_DEBUG_LEVEL == 2
-#   define _LIBCPP_DEBUG_ASSERT(x, m) _LIBCPP_ASSERT(__libcpp_is_constant_evaluated() || (x), m)
-#   define _LIBCPP_ASSERT_IMPL(x, m) ((x) ? (void)0 : _VSTD::__libcpp_debug_function(_VSTD::__libcpp_debug_info(__FILE__, __LINE__, #x, m)))
+#   define _LIBCPP_DEBUG_ASSERT(x, m) _LIBCPP_ASSERT(::std::__libcpp_is_constant_evaluated() || (x), m)
+#   define _LIBCPP_ASSERT_IMPL(x, m) ((x) ? (void)0 : ::std::__libcpp_debug_function(::std::__libcpp_debug_info(__FILE__, __LINE__, #x, m)))
 #else
 #   error _LIBCPP_DEBUG_LEVEL must be one of 0, 1, 2
 #endif

include/module.modulemap

diff --git a/include/module.modulemap b/include/module.modulemap
index a182ded..442958b 100644
--- a/include/module.modulemap
+++ b/include/module.modulemap
@@ -2,7 +2,8 @@
 // since __config may be included from C headers which may create an
 // include cycle.
 module std_config [system] [extern_c] {
-    header "__config"
+  textual header "__config"
+  textual header "__config_site"
 }
 
 module std [system] {