[libc++] Re-enable the clang_modules_include test for Objective-C++

[ldionne]

This reverts commit aa60b26, which was a temporary workaround.
The underlying issue was fixed in Clang via c2c840b.

This was originally https://reviews.llvm.org/D158694.

[llvmbot]

@llvm/pr-subscribers-libcxx

@llvm/pr-subscribers-clang

Changes

This reverts commit aa60b26, which was a temporary workaround.

This was originally https://reviews.llvm.org/D158694.

---

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

2 Files Affected:

• (added) clang/foo ()
• (modified) libcxx/test/libcxx/clang_modules_include.gen.py (-3)

diff --git a/clang/foo b/clang/foo
new file mode 100644
index 000000000000000..e69de29bb2d1d64
diff --git a/libcxx/test/libcxx/clang_modules_include.gen.py b/libcxx/test/libcxx/clang_modules_include.gen.py
index b4c5c79a47f6823..b4aecfe5d8faae6 100644
--- a/libcxx/test/libcxx/clang_modules_include.gen.py
+++ b/libcxx/test/libcxx/clang_modules_include.gen.py
@@ -44,11 +44,8 @@
 #include <{header}>
 """)
 
-# TODO: Remove the UNSUPPORTED{BLOCKLIT}: clang-modules-build once issues with this test have been figured out.
 print(f"""\
 //--- __std_clang_module.compile.pass.mm
-// UNSUPPORTED{BLOCKLIT}: clang-modules-build
-
 // RUN{BLOCKLIT}: %{{cxx}} %s %{{flags}} %{{compile_flags}} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only
 
 // REQUIRES{BLOCKLIT}: clang-modules-build

[ldionne]

@mordante I'm not certain what's going on here, I get

[...]/clang_modules_include.gen.py/__std_clang_module.compile.pass.mm:22:2: error: import of module 'std' imported non C++20 importable modules
   22 | @import std;
      |  ^
1 error generated.

Can you assist? It only happens with Clang trunk.

[mordante]

@mordante I'm not certain what's going on here, I get

[...]/clang_modules_include.gen.py/__std_clang_module.compile.pass.mm:22:2: error: import of module 'std' imported non C++20 importable modules
   22 | @import std;
      |  ^
1 error generated.

Can you assist? It only happens with Clang trunk.

I tested this locally and indeed it works with clang-17 and fails with clang-18

@ChuanqiXu9 This seems to be introduced in 574ee1c.

This test uses a Objective-C++ file. Is it easy for you to fix or should I file a bug report?

[ChuanqiXu9]

@mordante I'm not certain what's going on here, I get

[...]/clang_modules_include.gen.py/__std_clang_module.compile.pass.mm:22:2: error: import of module 'std' imported non C++20 importable modules
   22 | @import std;
      |  ^
1 error generated.

Can you assist? It only happens with Clang trunk.

I tested this locally and indeed it works with clang-17 and fails with clang-18

@ChuanqiXu9 This seems to be introduced in 574ee1c.

This test uses a Objective-C++ file. Is it easy for you to fix or should I file a bug report?

The motivation of my change was that I find multiple people are trying to fake import std from clang modules. This is not wanted. So I tried to ban it. I'll try to fix it or revert it later today if I didn't.

[ChuanqiXu9]

I tried to fix this in c2c840b. Sorry for disturbing.

[mordante]

I tried to fix this in c2c840b. Sorry for disturbing.

Thanks for the quick fix! I've tested the fix with this patch locally and it passes.

[ldionne]

Thanks folks! I rebased and I'm re-running the CI. I'll merge once it's green.

[github-actions]

⚠️ Python code formatter, darker found issues in your code. ⚠️

You can test this locally with the following command:

darker --check --diff -r 1ec5b1f483aa154255d919af9abf5eca2fe8635c...217e8477c88eb994ae5beb14dcac9162385e1289 libcxx/test/libcxx/clang_modules_include.gen.py

View the diff from darker here.

--- clang_modules_include.gen.py	2024-03-11 13:54:19.000000 +0000
+++ clang_modules_include.gen.py	2024-03-11 13:57:33.782661 +0000
@@ -45,11 +45,12 @@
 {lit_header_restrictions.get(header, '')}
 
 #include <{header}>
 """)
 
-print(f"""\
+print(
+    f"""\
 //--- __std_clang_module.compile.pass.mm
 // RUN{BLOCKLIT}: %{{cxx}} %s %{{flags}} %{{compile_flags}} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only
 
 // REQUIRES{BLOCKLIT}: clang-modules-build
 
@@ -69,6 +70,7 @@
 // TODO: Investigate this failure
 // UNSUPPORTED{BLOCKLIT}: LIBCXX-FREEBSD-FIXME
 
 @import std;
 
-""")
+"""
+)

[ldionne]

I rebased again. Last time I rebased there was still the same Clang issue.

[mordante]

I rebased again. Last time I rebased there was still the same Clang issue.

I guess nobody ever updated our Docker image. I want to look at that soon so we can start testing LLVM-19 in the CI.

[ldionne]

Merging since the relevant tests have passed.