[libc++] Add coverage for C++17 and Clang Modules with LSV (llvm#131815)

In recent versions of Clang, using -std=c++20 (and later) implies LSV
when compiling with modules. This change resulted in making our LSV job
redundant with the regular modules job, which uses the latest Standard.
This patch increases the coverage of our CI without increasing its cost
by pinning the LSV job to use C++17, which normally doesn't use LSV. A
related question is whether we should add coverage for non-LSV builds
using Clang modules.

Author: ldionne

.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,