[libc++][Android] Allow testing libc++ with clang-r536225 #116149
Conversation
The Android clang-r536225 compiler identifies as Clang 19, but it is based on commit fc57f88, which predates the official LLVM 19.0.0 release. Some tests need fixes: * The sized delete tests fail because clang-r536225 leaves sized deallocation off by default. * std::array<T[0]> is true when this Android Clang version is used with a trunk libc++, but we expect it to be false in the test. In practice, Clang and libc++ usually come from the same commit on Android.
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Ryan Prichard (rprichard) ChangesThe Android clang-r536225 compiler identifies as Clang 19, but it is based on commit fc57f88, which predates the official LLVM 19.0.0 release. Some tests need fixes:
Full diff: https://github.com/llvm/llvm-project/pull/116149.diff 3 Files Affected:
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array14.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array14.pass.cpp
index 85b641322d99e3..f2504a09ac8ab5 100644
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array14.pass.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array14.pass.cpp
@@ -11,6 +11,10 @@
// These compiler versions don't enable sized deallocation by default.
// UNSUPPORTED: clang-17, clang-18
+// Android clang-r536225 identifies as clang-19 but it predates the real
+// LLVM 19.0.0, so it also leaves sized deallocation off by default.
+// UNSUPPORTED: android && clang-19
+
// UNSUPPORTED: sanitizer-new-delete, c++03, c++11
// XFAIL: apple-clang
// XFAIL: using-built-library-before-llvm-11
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete14.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete14.pass.cpp
index ae614a1432f7db..2d45283c225426 100644
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete14.pass.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete14.pass.cpp
@@ -11,6 +11,10 @@
// These compiler versions do not enable sized deallocation by default.
// UNSUPPORTED: clang-17, clang-18
+// Android clang-r536225 identifies as clang-19 but it predates the real
+// LLVM 19.0.0, so it also leaves sized deallocation off by default.
+// UNSUPPORTED: android && clang-19
+
// UNSUPPORTED: sanitizer-new-delete, c++03, c++11
// XFAIL: apple-clang
// XFAIL: using-built-library-before-llvm-11
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp
index 26a469a30515af..d42e00c878e945 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp
@@ -73,7 +73,15 @@ typedef void (*FunctionPtr)();
int main(int, char**)
{
test_is_array<char[3]>();
+ // Android clang-r536225 identifies as clang-19, but it predates the
+ // LLVM 19.0.0 release. It lacks llvm.org/pr86652, which changed __is_array
+ // to return false for T[0]. llvm.org/pr93037 relies on that change for
+ // correct handling of std::is_array<T[0]>. This test will pass as long as
+ // Clang and libc++ come from the same LLVM commit, but we can't detect that
+ // here.
+#if !defined(__ANDROID__) || __clang_major__ != 19
test_is_not_array<char[0]>();
+#endif
test_is_array<char[]>();
test_is_array<Union[]>();
|
| // Android clang-r536225 identifies as clang-19 but it predates the real | ||
| // LLVM 19.0.0, so it also leaves sized deallocation off by default. | ||
| // UNSUPPORTED: android && clang-19 |
There was a problem hiding this comment.
Could we instead do UNSUPPORTED: clang-19.0? Also, is there a reason you can't update to a release version?
There was a problem hiding this comment.
AFAIK UNSUPPORTED: clang-19.0 would work. I'll double-check.
The Android libc++ CI uses a build of LLVM from the Android LLVM team itself because the ordinary Linux LLVM builds don't have the Android builtin archives, and the Android team doesn't use the official upstream LLVM release branches. I believe the issue is that release schedules don't line up? The android_llvm README has some comments about the Android LLVM release schedule, https://android.googlesource.com/toolchain/llvm_android/+/refs/heads/main#android-clang_llvm-toolchain.
In any case, the Android LLVM build also has a large number of cherry picks and local patches. (https://android.googlesource.com/toolchain/llvm_android/+/refs/heads/main/patches/).
| // correct handling of std::is_array<T[0]>. This test will pass as long as | ||
| // Clang and libc++ come from the same LLVM commit, but we can't detect that | ||
| // here. | ||
| #if !defined(__ANDROID__) || __clang_major__ != 19 || __clang_minor__ != 0 |
There was a problem hiding this comment.
Can you use TEST_CLANG_VER instead? I think we're more likely to grep for that and eventually remove it than __clang_major__.
There was a problem hiding this comment.
Yes, that should work. I changed it to #if !defined(__ANDROID__) || TEST_CLANG_VER != 1900 and verified that the test still passes locally in my updated Docker image.
4 participants
The Android clang-r536225 compiler identifies as Clang 19, but it is based on commit fc57f88, which predates the official LLVM 19.0.0 release.
Some tests need fixes:
The sized delete tests fail because clang-r536225 leaves sized deallocation off by default.
std::array<T[0]> is true when this Android Clang version is used with a trunk libc++, but we expect it to be false in the test. In practice, Clang and libc++ usually come from the same commit on Android.