[libcxx-commits] [libcxx] c938529 - [libc++] [modules] Add __threading_support to the modulemap.

[Arthur O'Dwyer via libcxx-commits]

Author: Arthur O'Dwyer
Date: 2021-05-29T19:54:38-04:00
New Revision: c9385297ce75a8847e4910bb34d6b6c92ce36a5b

URL: https://github.com/llvm/llvm-project/commit/c9385297ce75a8847e4910bb34d6b6c92ce36a5b
DIFF: https://github.com/llvm/llvm-project/commit/c9385297ce75a8847e4910bb34d6b6c92ce36a5b.diff

LOG: [libc++] [modules] Add __threading_support to the modulemap.

It looks to me as if *every* helper header needs to be added to the modulemap,
actually; which is unfortunate since we keep proliferating them at such a
rapid pace.

Added: 
    

Modified: 
    libcxx/include/module.modulemap
    libcxx/test/libcxx/modules/stds_include.sh.cpp

Removed: 
    


################################################################################
diff  --git a/libcxx/include/module.modulemap b/libcxx/include/module.modulemap
index 8f023942c042f..a6f10a02368a3 100644
--- a/libcxx/include/module.modulemap
+++ b/libcxx/include/module.modulemap
@@ -533,21 +533,22 @@ module std [system] {
   }
 
   // FIXME: These should be private.
-  module __bits { header "__bits" export * }
   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 __threading_support { header "__threading_support" export * }
   module __tree { header "__tree" export * }
   module __tuple { header "__tuple" export * }
   module __undef_macros { header "__undef_macros" export * }
-  module __node_handle { header "__node_handle" export * }
 
   module experimental {
     requires cplusplus11

diff  --git a/libcxx/test/libcxx/modules/stds_include.sh.cpp b/libcxx/test/libcxx/modules/stds_include.sh.cpp
index 9ea13bbc34079..41186749b7d3d 100644
--- a/libcxx/test/libcxx/modules/stds_include.sh.cpp
+++ b/libcxx/test/libcxx/modules/stds_include.sh.cpp
@@ -28,9 +28,9 @@
 //        the same modules caches were reused across standard dialects.
 // RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++03 -DINVALIDATE_CACHE_CXX03 %s
 // RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++11 -DINVALIDATE_CACHE_CXX11 %s
-// RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++14 -DINVALIDATE_CACHE_CKK14 %s
+// RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++14 -DINVALIDATE_CACHE_CXX14 %s
 // RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++17 -DINVALIDATE_CACHE_CXX17 %s
-// RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++2a -DINVALIDATE_CACHE_CXX2A %s
+// RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++20 -DINVALIDATE_CACHE_CXX20 %s
 
 #include <vector>