This is an archive of the discontinued LLVM Phabricator instance.

Differential D103309

[libcxx] [test] Don't look for the literal spelling __mbstate_t
ClosedPublic

Authored by mstorsjo on May 28 2021, 4:22 AM.

Details

Reviewers
Mordante
ldionne
Group Reviewers
Restricted Project
Commits
rGb48a256e9c6e: [libcxx] [test] Don't look for the literal spelling __mbstate_t in warnings
Summary

While the code uses the type name std::mbstate_t, the warning message
mentions the original underlying type, which is a C library internal
type name.

On Windows this type is called _Mbstatet instead of __mbstate_t. Use
expect-warning-re to avoid spelling out the literal name of the type.

Due to issues with the detection of the clang-verify feature, these
tests have been skipped in the Windows CI configuration so far.

Diff Detail

Unit TestsFailed

TimeTest
580 mslibcxx CI GCC-next/C++20 > libc++.std/atomics/atomics_types_operations/atomics_types_operations_req::atomic_is_lock_free.pass.cpp
1,750 mslibcxx CI GCC-next/C++20 > libc++.std/iterators/iterator_primitives/range_iter_ops/range_iter_ops_advance::advance.pass.cpp
1,280 mslibcxx CI GCC-next/C++20 > libc++.std/iterators/iterator_primitives/range_iter_ops/range_iter_ops_next::iterator_count.pass.cpp
1,300 mslibcxx CI GCC-next/C++20 > libc++.std/iterators/iterator_primitives/range_iter_ops/range_iter_ops_next::iterator_count_sentinel.pass.cpp
1,490 mslibcxx CI GCC-next/C++20 > libc++.std/iterators/iterator_primitives/range_iter_ops/range_iter_ops_next::iterator_sentinel.pass.cpp
View Full Test Results (12 Failed)

Event Timeline

mstorsjo requested review of this revision.May 28 2021, 4:22 AM
mstorsjo created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptMay 28 2021, 4:22 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B106683: Diff 348489.May 28 2021, 6:56 AM
Mordante accepted this revision as: Mordante.May 29 2021, 1:42 AM
Mordante added a subscriber: Mordante.

LGTM, modulo the remark.

libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/codecvt_byname_char16_t_char.depr_in_cxx20.verify.cpp
23

I think it would be good to add some comment like "Don't test for the exact type since the underlying type of std::mbstate_t depends on implementation details."

ldionne accepted this revision.May 31 2021, 8:59 AM
This revision is now accepted and ready to land.May 31 2021, 8:59 AM
Closed by commit rGb48a256e9c6e: [libcxx] [test] Don't look for the literal spelling __mbstate_t in warnings (authored by mstorsjo). · Explain WhyMay 31 2021, 12:13 PM
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rGb48a256e9c6e: [libcxx] [test] Don't look for the literal spelling __mbstate_t in warnings.

Revision Contents

PathSize
libcxx/
test/
std/
localization/
locale.categories/
category.ctype/
locale.codecvt.byname/
2 lines
2 lines
locale.codecvt/
2 lines
2 lines

Diff 348489

libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/codecvt_byname_char16_t_char.depr_in_cxx20.verify.cpp

Show All 14 Lines
#include <locale> #include <locale>
#include "../with_public_dtor.hpp" #include "../with_public_dtor.hpp"
#include "test_macros.h" #include "test_macros.h"
int main(int, char **) int main(int, char **)
{ {
with_public_dtor<std::codecvt_byname<char16_t, char, std::mbstate_t>> cvt("", 0); // expected-warning {{'codecvt_byname<char16_t, char, __mbstate_t>' is deprecated}} with_public_dtor<std::codecvt_byname<char16_t, char, std::mbstate_t>> cvt("", 0); // expected-warning-re {{'codecvt_byname<char16_t, char, {{.*}}>' is deprecated}}
MordanteUnsubmitted
Not Done
ReplyInline Actions

I think it would be good to add some comment like "Don't test for the exact type since the underlying type of std::mbstate_t depends on implementation details."

Mordante: I think it would be good to add some comment like "Don't test for the exact type since the…
(void)cvt; (void)cvt;
return 0; return 0;
} }

libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/codecvt_byname_char32_t_char.depr_in_cxx20.verify.cpp

Show All 14 Lines
#include <locale> #include <locale>
#include "../with_public_dtor.hpp" #include "../with_public_dtor.hpp"
#include "test_macros.h" #include "test_macros.h"
int main(int, char **) int main(int, char **)
{ {
with_public_dtor<std::codecvt_byname<char32_t, char, std::mbstate_t>> cvt("", 0); // expected-warning {{'codecvt_byname<char32_t, char, __mbstate_t>' is deprecated}} with_public_dtor<std::codecvt_byname<char32_t, char, std::mbstate_t>> cvt("", 0); // expected-warning-re {{'codecvt_byname<char32_t, char, {{.*}}>' is deprecated}}
(void)cvt; (void)cvt;
return 0; return 0;
} }

libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/codecvt_char16_t_char.depr_in_cxx20.verify.cpp

Show All 14 Lines
#include <locale> #include <locale>
#include "../with_public_dtor.hpp" #include "../with_public_dtor.hpp"
#include "test_macros.h" #include "test_macros.h"
int main(int, char **) int main(int, char **)
{ {
with_public_dtor<std::codecvt<char16_t, char, std::mbstate_t>> cvt("", 0); // expected-warning {{'codecvt<char16_t, char, __mbstate_t>' is deprecated}} with_public_dtor<std::codecvt<char16_t, char, std::mbstate_t>> cvt("", 0); // expected-warning-re {{'codecvt<char16_t, char, {{.*}}>' is deprecated}}
(void)cvt; (void)cvt;
return 0; return 0;
} }

libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/codecvt_char32_t_char.depr_in_cxx20.verify.cpp

Show All 14 Lines
#include <locale> #include <locale>
#include "../with_public_dtor.hpp" #include "../with_public_dtor.hpp"
#include "test_macros.h" #include "test_macros.h"
int main(int, char **) int main(int, char **)
{ {
with_public_dtor<std::codecvt<char32_t, char, std::mbstate_t>> cvt("", 0); // expected-warning {{'codecvt<char32_t, char, __mbstate_t>' is deprecated}} with_public_dtor<std::codecvt<char32_t, char, std::mbstate_t>> cvt("", 0); // expected-warning-re {{'codecvt<char32_t, char, {{.*}}>' is deprecated}}
(void)cvt; (void)cvt;
return 0; return 0;
} }