Skip to content

[libcxxabi][test] Check that all copied files are synced between llvm and libcxxabi #142262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 31, 2025

Conversation

Michael137
Copy link
Member

This patch expands the list of files we check to all the ones that are copied via cp-to-llvm.sh.

… and libcxxabi

This patch expands the list of files we check to all the ones that are
copied via `cp-to-llvm.sh`.
@Michael137 Michael137 requested a review from a team as a code owner May 31, 2025 08:32
@llvmbot llvmbot added the libc++abi libc++abi C++ Runtime Library. Not libc++. label May 31, 2025
@llvmbot
Copy link
Member

llvmbot commented May 31, 2025

@llvm/pr-subscribers-libcxxabi

Author: Michael Buch (Michael137)

Changes

This patch expands the list of files we check to all the ones that are copied via cp-to-llvm.sh.


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

1 Files Affected:

  • (modified) libcxxabi/test/itanium_demangle_matches_llvm.sh.test (+16-2)
diff --git a/libcxxabi/test/itanium_demangle_matches_llvm.sh.test b/libcxxabi/test/itanium_demangle_matches_llvm.sh.test
index 31371d121fbdd..55e389bdd7210 100644
--- a/libcxxabi/test/itanium_demangle_matches_llvm.sh.test
+++ b/libcxxabi/test/itanium_demangle_matches_llvm.sh.test
@@ -1,6 +1,20 @@
-# This test diffs the ItaniumDemangle.h header in libcxxabi and LLVM to ensure
-# that they are the same.
+# This test diffs the various headers synced by cp-to-llvm.sh
+# between libcxxabi and LLVM to ensure that they are the same.
 
 # RUN: tail -n +3 %{libcxxabi}/src/demangle/ItaniumDemangle.h > %t.libcxxabi_demangle
 # RUN: tail -n +3 %{llvm}/include/llvm/Demangle/ItaniumDemangle.h > %t.llvm_demangle
 # RUN: diff %t.libcxxabi_demangle %t.llvm_demangle
+
+# RUN: tail -n +3 %{libcxxabi}/src/demangle/ItaniumNodes.def > %t.libcxxabi_nodes
+# RUN: tail -n +3 %{llvm}/include/llvm/Demangle/ItaniumNodes.def > %t.llvm_nodes
+# RUN: diff %t.libcxxabi_nodes %t.llvm_nodes
+
+# RUN: tail -n +3 %{libcxxabi}/src/demangle/StringViewExtras.h > %t.libcxxabi_extras
+# RUN: tail -n +3 %{llvm}/include/llvm/Demangle/StringViewExtras.h > %t.llvm_extras
+# RUN: diff %t.libcxxabi_extras %t.llvm_extras
+
+# RUN: tail -n +3 %{libcxxabi}/src/demangle/Utility.h > %t.libcxxabi_utility
+# RUN: tail -n +3 %{llvm}/include/llvm/Demangle/Utility.h > %t.llvm_utility
+# RUN: diff %t.libcxxabi_utility %t.llvm_utility
+
+# RUN: diff %{libcxxabi}/test/DemangleTestCases.inc %{llvm}/include/llvm/Testing/Demangle/DemangleTestCases.inc

@Michael137 Michael137 merged commit 061ef3c into llvm:main May 31, 2025
36 of 37 checks passed
@Michael137 Michael137 deleted the demangler-test-cases-sync-test branch May 31, 2025 20:19
@llvm-ci
Copy link
Collaborator

llvm-ci commented May 31, 2025

LLVM Buildbot has detected a new failure on builder sanitizer-aarch64-linux running on sanitizer-buildbot7 while building libcxxabi at step 2 "annotate".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/51/builds/17168

Here is the relevant piece of the build log for the reference
Step 2 (annotate) failure: 'python ../sanitizer_buildbot/sanitizers/zorg/buildbot/builders/sanitizers/buildbot_selector.py' (failure) (timed out)
...
[181/186] Generating MSAN_INST_GTEST.gtest-all.cc.aarch64.o
[182/186] Generating MSAN_INST_TEST_OBJECTS.msan_test.cpp.aarch64-with-call.o
[183/186] Generating Msan-aarch64-with-call-Test
[184/186] Generating MSAN_INST_TEST_OBJECTS.msan_test.cpp.aarch64.o
[185/186] Generating Msan-aarch64-Test
[185/186] Running compiler_rt regression tests
llvm-lit: /home/b/sanitizer-aarch64-linux/build/llvm-project/llvm/utils/lit/lit/discovery.py:276: warning: input '/home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/test/interception/Unit' contained no tests
llvm-lit: /home/b/sanitizer-aarch64-linux/build/llvm-project/llvm/utils/lit/lit/discovery.py:276: warning: input '/home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/test/sanitizer_common/Unit' contained no tests
llvm-lit: /home/b/sanitizer-aarch64-linux/build/llvm-project/llvm/utils/lit/lit/main.py:73: note: The test suite configuration requested an individual test timeout of 0 seconds but a timeout of 900 seconds was requested on the command line. Forcing timeout to be 900 seconds.
-- Testing: 5923 tests, 72 workers --
command timed out: 1200 seconds without output running [b'python', b'../sanitizer_buildbot/sanitizers/zorg/buildbot/builders/sanitizers/buildbot_selector.py'], attempting to kill
process killed by signal 9
program finished with exit code -1
elapsedTime=1621.552696
Testing:  0.. 10.. 20.. 30.. 40.. 50.. 60.. 70.. 80.. 90..
Step 9 (test compiler-rt symbolizer) failure: test compiler-rt symbolizer (failure)
...
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.compat/cmath.inc
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.compat/csetjmp.inc
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.compat/csignal.inc
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.compat/cstdarg.inc
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.compat/cstddef.inc
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.compat/cstdint.inc
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.compat/cstdio.inc
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.compat/cstdlib.inc
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.compat/cstring.inc
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.compat/ctime.inc
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.compat/cuchar.inc
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.compat/cwchar.inc
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.compat/cwctype.inc
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.cppm
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/share/libc++/v1/std.compat.cppm
-- Installing: /home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/lib/tsan/libcxx_tsan_aarch64/lib/libc++.modules.json
[165/186] Generating libmsan_loadable.aarch64-with-call.so
[166/186] Performing build step for 'libcxx_fuzzer_aarch64'
ninja: no work to do.
[167/186] Installing libcxx_fuzzer_aarch64...
[0/1] Install the project...
-- Install configuration: "Release"
[169/186] Linking CXX static library /home/b/sanitizer-aarch64-linux/build/build_default/lib/clang/21/lib/aarch64-unknown-linux-gnu/libclang_rt.fuzzer_interceptors.a
[170/186] Linking CXX static library /home/b/sanitizer-aarch64-linux/build/build_default/lib/clang/21/lib/aarch64-unknown-linux-gnu/libclang_rt.fuzzer.a
[171/186] Linking CXX static library /home/b/sanitizer-aarch64-linux/build/build_default/lib/clang/21/lib/aarch64-unknown-linux-gnu/libclang_rt.fuzzer_no_main.a
[172/186] Generating MSAN_INST_TEST_OBJECTS.msan_test_main.cpp.aarch64.o
[173/186] Generating MSAN_INST_TEST_OBJECTS.msan_test_main.cpp.aarch64-with-call.o
[174/186] Generating FuzzedDataProviderTestObjects.FuzzedDataProviderUnittest.cpp.aarch64.o
[175/186] Generating FuzzerTestObjects.gtest-all.cc.aarch64.o
[176/186] Generating FuzzedDataProviderTestObjects.gtest-all.cc.aarch64.o
[177/186] Generating FuzzerUtils-aarch64-Test
[178/186] Generating FuzzerTestObjects.FuzzerUnittest.cpp.aarch64.o
[179/186] Generating Fuzzer-aarch64-Test
[180/186] Generating MSAN_INST_GTEST.gtest-all.cc.aarch64-with-call.o
[181/186] Generating MSAN_INST_GTEST.gtest-all.cc.aarch64.o
[182/186] Generating MSAN_INST_TEST_OBJECTS.msan_test.cpp.aarch64-with-call.o
[183/186] Generating Msan-aarch64-with-call-Test
[184/186] Generating MSAN_INST_TEST_OBJECTS.msan_test.cpp.aarch64.o
[185/186] Generating Msan-aarch64-Test
[185/186] Running compiler_rt regression tests
llvm-lit: /home/b/sanitizer-aarch64-linux/build/llvm-project/llvm/utils/lit/lit/discovery.py:276: warning: input '/home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/test/interception/Unit' contained no tests
llvm-lit: /home/b/sanitizer-aarch64-linux/build/llvm-project/llvm/utils/lit/lit/discovery.py:276: warning: input '/home/b/sanitizer-aarch64-linux/build/build_default/runtimes/runtimes-bins/compiler-rt/test/sanitizer_common/Unit' contained no tests
llvm-lit: /home/b/sanitizer-aarch64-linux/build/llvm-project/llvm/utils/lit/lit/main.py:73: note: The test suite configuration requested an individual test timeout of 0 seconds but a timeout of 900 seconds was requested on the command line. Forcing timeout to be 900 seconds.
-- Testing: 5923 tests, 72 workers --

command timed out: 1200 seconds without output running [b'python', b'../sanitizer_buildbot/sanitizers/zorg/buildbot/builders/sanitizers/buildbot_selector.py'], attempting to kill
process killed by signal 9
program finished with exit code -1
elapsedTime=1621.552696
Testing:  0.. 10.. 20.. 30.. 40.. 50.. 60.. 70.. 80.. 90..

DhruvSrivastavaX pushed a commit to DhruvSrivastavaX/lldb-for-aix that referenced this pull request Jun 12, 2025
… and libcxxabi (llvm#142262)

This patch expands the list of files we check to all the ones that are
copied via `cp-to-llvm.sh`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
libc++abi libc++abi C++ Runtime Library. Not libc++.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants