From 25264f6b3a75f505c1ca3bc7e48ce173560c1b2c Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 12 Apr 2023 22:14:05 +0100 Subject: [PATCH] libstdc++: Fix some AIX test failures AIX defines struct tstate with non-reserved names, so adjust the 17_intro/names.cc test. It also defines struct user, which conflicts with namespace user in some tests. Replacing the global operator new doesn't work on AIX the same way as it does for ELF, so skip some tests that depend on replacing it. Add missing DG directives to synchronized_value test so it doesn't run for the single-threaded AIX multilib. libstdc++-v3/ChangeLog: * testsuite/17_intro/names.cc [_AIX]: Do not define policy. * testsuite/19_diagnostics/error_code/cons/lwg3629.cc: Rename namespace to avoid clashing with libc struct. * testsuite/19_diagnostics/error_condition/cons/lwg3629.cc: Likewise. * testsuite/23_containers/unordered_map/96088.cc: Skip on AIX. * testsuite/23_containers/unordered_multimap/96088.cc: Likewise. * testsuite/23_containers/unordered_multiset/96088.cc: Likewise. * testsuite/23_containers/unordered_set/96088.cc: Likewise. * testsuite/experimental/synchronized_value.cc: Require gthreads and add missing option for pthreads targets. --- libstdc++-v3/testsuite/17_intro/names.cc | 2 ++ .../19_diagnostics/error_code/cons/lwg3629.cc | 18 +++++++++--------- .../19_diagnostics/error_condition/cons/lwg3629.cc | 18 +++++++++--------- .../testsuite/23_containers/unordered_map/96088.cc | 1 + .../23_containers/unordered_multimap/96088.cc | 1 + .../23_containers/unordered_multiset/96088.cc | 1 + .../testsuite/23_containers/unordered_set/96088.cc | 1 + .../testsuite/experimental/synchronized_value.cc | 2 ++ 8 files changed, 26 insertions(+), 18 deletions(-) diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index 9932dea..eb4d064 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -243,6 +243,8 @@ #undef v // defines trb::func and cputime_tmr::func #undef func +// defines tstate::policy +#undef policy #endif #ifdef __APPLE__ diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/lwg3629.cc b/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/lwg3629.cc index 70fa5e8..bd7c6ce 100644 --- a/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/lwg3629.cc +++ b/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/lwg3629.cc @@ -3,18 +3,18 @@ // 3629. make_error_code and make_error_condition are customization points // Verify that make_error_code is looked up using ADL only. -namespace user +namespace User { struct E1; } // N.B. not in associated namespace of E1, and declared before . -user::E1 make_error_code(user::E1); +User::E1 make_error_code(User::E1); #include // declares std::make_error_code(future_errc) #include -namespace user +namespace User { struct E1 { @@ -32,17 +32,17 @@ namespace user }; } -template<> struct std::is_error_code_enum : std::true_type { }; -template<> struct std::is_error_code_enum : std::true_type { }; -template<> struct std::is_error_code_enum : std::true_type { }; +template<> struct std::is_error_code_enum : std::true_type { }; +template<> struct std::is_error_code_enum : std::true_type { }; +template<> struct std::is_error_code_enum : std::true_type { }; // ::make_error_code(E1) should not be found by name lookup. -std::error_code e1( user::E1{} ); // { dg-error "here" } +std::error_code e1( User::E1{} ); // { dg-error "here" } // std::make_error_code(future_errc) should not be found by name lookup. -std::error_code e2( user::E2{} ); // { dg-error "here" } +std::error_code e2( User::E2{} ); // { dg-error "here" } // std::make_error_code(errc) should not be found by name lookup. -std::error_code e3( user::E3{} ); // { dg-error "here" } +std::error_code e3( User::E3{} ); // { dg-error "here" } // { dg-error "use of deleted function" "" { target *-*-* } 0 } diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/lwg3629.cc b/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/lwg3629.cc index 562a99a..d72163b 100644 --- a/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/lwg3629.cc +++ b/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/lwg3629.cc @@ -3,18 +3,18 @@ // 3629. make_error_code and make_error_condition are customization points // Verify that make_error_condition is looked up using ADL only. -namespace user +namespace User { struct E1; } // N.B. not in associated namespace of E1, and declared before . -user::E1 make_error_condition(user::E1); +User::E1 make_error_condition(User::E1); #include // declares std::make_error_condition(future_errc) #include -namespace user +namespace User { struct E1 { @@ -32,17 +32,17 @@ namespace user }; } -template<> struct std::is_error_condition_enum : std::true_type { }; -template<> struct std::is_error_condition_enum : std::true_type { }; -template<> struct std::is_error_condition_enum : std::true_type { }; +template<> struct std::is_error_condition_enum : std::true_type { }; +template<> struct std::is_error_condition_enum : std::true_type { }; +template<> struct std::is_error_condition_enum : std::true_type { }; // ::make_error_condition(E1) should not be found by name lookup. -std::error_condition e1( user::E1{} ); // { dg-error "here" } +std::error_condition e1( User::E1{} ); // { dg-error "here" } // std::make_error_condition(future_errc) should not be found by name lookup. -std::error_condition e2( user::E2{} ); // { dg-error "here" } +std::error_condition e2( User::E2{} ); // { dg-error "here" } // std::make_error_condition(errc) should not be found by name lookup. -std::error_condition e3( user::E3{} ); // { dg-error "here" } +std::error_condition e3( User::E3{} ); // { dg-error "here" } // { dg-error "use of deleted function" "" { target *-*-* } 0 } diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/96088.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/96088.cc index 754b529..c6d50c2 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/96088.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/96088.cc @@ -1,5 +1,6 @@ // { dg-do run { target c++17 } } // { dg-require-effective-target std_allocator_new } +// { dg-xfail-run-if "AIX operator new" { powerpc-ibm-aix* } } // Copyright (C) 2021-2023 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/96088.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/96088.cc index b55afdf..214bc91 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/96088.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/96088.cc @@ -1,5 +1,6 @@ // { dg-do run { target c++17 } } // { dg-require-effective-target std_allocator_new } +// { dg-xfail-run-if "AIX operator new" { powerpc-ibm-aix* } } // Copyright (C) 2021-2023 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/96088.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/96088.cc index d50435a..838ce8d 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/96088.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/96088.cc @@ -1,5 +1,6 @@ // { dg-do run { target c++17 } } // { dg-require-effective-target std_allocator_new } +// { dg-xfail-run-if "AIX operator new" { powerpc-ibm-aix* } } // Copyright (C) 2021-2023 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/96088.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/96088.cc index 05a5dc0..0f7dce2 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_set/96088.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_set/96088.cc @@ -1,5 +1,6 @@ // { dg-do run { target c++17 } } // { dg-require-effective-target std_allocator_new } +// { dg-xfail-run-if "AIX operator new" { powerpc-ibm-aix* } } // Copyright (C) 2021-2023 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/experimental/synchronized_value.cc b/libstdc++-v3/testsuite/experimental/synchronized_value.cc index 8e81346..a7e556c 100644 --- a/libstdc++-v3/testsuite/experimental/synchronized_value.cc +++ b/libstdc++-v3/testsuite/experimental/synchronized_value.cc @@ -1,4 +1,6 @@ // { dg-do run { target c++17 } } +// { dg-additional-options "-pthread" { target pthread } } +// { dg-require-gthreads "" } #include #include -- 2.7.4