[𝘀𝗽𝗿] changes to main this commit is based on

Created using spr 1.3.6-beta.1

[skip ci]

Author: d0k

.github/workflows/libcxx-build-and-test.yaml

@@ -137,7 +137,7 @@ jobs:
           'generic-hardening-mode-fast',
           'generic-hardening-mode-fast-with-abi-breaks',
           'generic-merged',
-          'generic-modules-lsv',
+          'generic-modules-cxx17-lsv',
           'generic-no-exceptions',
           'generic-no-experimental',
           'generic-no-filesystem',

libcxx/cmake/caches/Generic-modules-cxx17-lsv.cmake

@@ -0,0 +1,2 @@
+set(LIBCXX_TEST_PARAMS "enable_modules=clang-lsv;std=c++17" CACHE STRING "")
+set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")

libcxx/cmake/caches/Generic-modules-lsv.cmake

@@ -9,6 +9,9 @@
 // UNSUPPORTED: no-threads
 // REQUIRES: c++03 || c++11 || c++14 || c++17 || c++20
 
+// No diagnostic gets emitted when we build with modules.
+// XFAIL: clang-modules-build
+
 // This test ensures that we issue a reasonable diagnostic when including <atomic> after
 // <stdatomic.h> has been included. Before C++23, this otherwise leads to obscure errors
 // because <atomic> may try to redefine things defined by <stdatomic.h>.

libcxx/test/libcxx/atomics/atomics.syn/incompatible_with_stdatomic.verify.cpp

@@ -454,9 +454,9 @@ generic-modules)
     check-runtimes
     check-abi-list
 ;;
-generic-modules-lsv)
+generic-modules-cxx17-lsv)
     clean
-    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-modules-lsv.cmake"
+    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-modules-cxx17-lsv.cmake"
     check-runtimes
     check-abi-list
 ;;

libcxx/utils/ci/run-buildbot

@@ -210,7 +210,8 @@ def getSuitableClangTidy(cfg):
         choices=["none", "clang", "clang-lsv"],
         type=str,
         help="Whether to build the test suite with modules enabled. "
-             "Select `clang` for Clang modules, and 'clang-lsv' for Clang modules with Local Submodule Visibility.",
+             "Select `clang` for Clang modules, and 'clang-lsv' for Clang modules with Local Submodule Visibility. "
+             "Note that in recent versions of Clang, using Clang modules with -std=c++20 and later implies LSV.",
         default="none",
         actions=lambda modules: filter(None, [
             AddFeature("clang-modules-build")           if modules in ("clang", "clang-lsv") else None,

libcxx/utils/libcxx/test/params.py

@@ -11026,6 +11026,7 @@ cc_library(
         ":LLVMDialect",
         ":MemRefToLLVM",
         ":OpenMPDialect",
+        ":OpenMPOpsIncGen",
         ":Pass",
     ],
 )