This is an archive of the discontinued LLVM Phabricator instance.

Differential D141300

[libc++] Fix missing clang-query substitution
AbandonedPublic

Authored by ldionne on Jan 9 2023, 9:33 AM.

Details

Reviewers
Mordante
Group Reviewers
Restricted Project
Summary

We must use %{clang-query} to expand to the right version of clang-query.
This must have been a typo.

Diff Detail

Unit TestsFailed

TimeTest
9,620 mslibcxx CI UBSAN > llvm-libc++-shared-cfg-in.libcxx::clang_query.sh.cpp
9,510 mslibcxx CI Unstable ABI > llvm-libc++-shared-cfg-in.libcxx::clang_query.sh.cpp

Event Timeline

ldionne created this revision.Jan 9 2023, 9:33 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 9 2023, 9:33 AM
ldionne requested review of this revision.Jan 9 2023, 9:33 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 9 2023, 9:34 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Mordante accepted this revision.Jan 9 2023, 9:48 AM
Mordante added a subscriber: Mordante.

Nice catch, thanks!

This revision is now accepted and ready to land.Jan 9 2023, 9:48 AM
philnik added a subscriber: philnik.Jan 9 2023, 9:49 AM

I've already fixed this in 64f06dda. Mark's patch probably landed between the creation of abi_tag_on_virtual and now.

ldionne abandoned this revision.Jan 9 2023, 10:35 AM
In D141300#4037013, @philnik wrote:

I've already fixed this in 64f06dda. Mark's patch probably landed between the creation of abi_tag_on_virtual and now.

Oh, thanks.

Harbormaster completed remote builds in B206572: Diff 487479.Jan 9 2023, 1:24 PM

Revision Contents

PathSize
libcxx/
test/
libcxx/
2 lines

Diff 487479

libcxx/test/libcxx/clang_query.sh.cpp

Show All 11 Lines
// The attributes hide_from_abi_of_visible.query relies on aren't applied on windows. // The attributes hide_from_abi_of_visible.query relies on aren't applied on windows.
// XFAIL: windows // XFAIL: windows
// RUN: %{clang-query} -f %S/clang_query/hide_from_abi_or_visible.query %s --use-color -- -Wno-unknown-warning-option %{compile_flags} -fno-modules > %t.output // RUN: %{clang-query} -f %S/clang_query/hide_from_abi_or_visible.query %s --use-color -- -Wno-unknown-warning-option %{compile_flags} -fno-modules > %t.output
// RUN: cat %t.output // RUN: cat %t.output
// RUN: cat %t.output | wc -l | grep -Fxq 1 // RUN: cat %t.output | wc -l | grep -Fxq 1
// RUN: clang-query -f %S/clang_query/abi_tag_on_virtual.query %s --use-color -- -Wno-unknown-warning-option %{compile_flags} -fno-modules > %t.output // RUN: %{clang-query} -f %S/clang_query/abi_tag_on_virtual.query %s --use-color -- -Wno-unknown-warning-option %{compile_flags} -fno-modules > %t.output
// RUN: cat %t.output // RUN: cat %t.output
// RUN: cat %t.output | wc -l | grep -Fxq 1 // RUN: cat %t.output | wc -l | grep -Fxq 1
// Prevent <ext/hash_map> from generating deprecated warnings for this test. // Prevent <ext/hash_map> from generating deprecated warnings for this test.
#if defined(__DEPRECATED) #if defined(__DEPRECATED)
# undef __DEPRECATED # undef __DEPRECATED
#endif #endif
▲ Show 20 Lines • Show All 249 Lines • Show Last 20 Lines