mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-19 00:55:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libstdc++: Add effective-target for std::allocator implementation

Browse Source 
This allows tests to be skipped if the std::allocator implementation is
not __gnu_cxx::new_allocator.

The 20_util/allocator/overaligned.cc test requires either C++17 or
new_allocator, otherwise we can't guarantee to return overaligned
memory.

libstdc++-v3/ChangeLog:

	* testsuite/18_support/50594.cc: Check effective target.
	* testsuite/20_util/allocator/1.cc: Likewise.
	* testsuite/20_util/allocator/overaligned.cc: Likewise.
	* testsuite/23_containers/unordered_map/96088.cc: Likewise.
	* 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/ext/throw_allocator/check_delete.cc: Likewise.
	* testsuite/ext/throw_allocator/check_new.cc: Likewise.
	* testsuite/lib/libstdc++.exp (check_effective_target_std_allocator_new):
	Define new proc.
This commit is contained in:
Jonathan Wakely 2021-11-22 14:51:16 +00:00
parent 16e95050f7
commit 39de0e5411
10 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libstdc++-v3/testsuite/18_support/50594.cc
View File

@ -1,5 +1,6 @@
// { dg-options "-fwhole-program" }
// { dg-additional-options "-static-libstdc++" { target *-*-mingw* } }
// { dg-require-effective-target std_allocator_new }
// { dg-xfail-run-if "AIX operator new" { powerpc-ibm-aix* } }
// Copyright (C) 2011-2021 Free Software Foundation, Inc.

7
libstdc++-v3/testsuite/20_util/allocator/1.cc
View File

@ -17,6 +17,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-require-effective-target std_allocator_new }
// 20.4.1.1 allocator members
#include <memory>
@ -35,7 +37,7 @@ struct gnu { };
bool check_new = false;
bool check_delete = false;
void*
void*
operator new(std::size_t n) THROW(std::bad_alloc)
{
check_new = true;
@ -59,9 +61,6 @@ void test01()
{
std::allocator<gnu> obj;
// NB: These should work for various size allocation and
// deallocations. Currently, they only work as expected for sizes >
// _MAX_BYTES as defined in stl_alloc.h, which happes to be 128.
gnu* pobj = obj.allocate(256);
VERIFY( check_new );

2
libstdc++-v3/testsuite/20_util/allocator/overaligned.cc
View File

@ -16,7 +16,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-options "-faligned-new" }
// { dg-do run { target c++11 } }
// { dg-do run { target { c++11 && { c++17 || std_allocator_new } } } }
// { dg-require-cstdint "" }
#include <memory>

1
libstdc++-v3/testsuite/23_containers/unordered_map/96088.cc
View File

@ -1,4 +1,5 @@
// { dg-do run { target c++17 } }
// { dg-require-effective-target std_allocator_new }
// Copyright (C) 2021 Free Software Foundation, Inc.
//

1
libstdc++-v3/testsuite/23_containers/unordered_multimap/96088.cc
View File

@ -1,4 +1,5 @@
// { dg-do run { target c++17 } }
// { dg-require-effective-target std_allocator_new }
// Copyright (C) 2021 Free Software Foundation, Inc.
//

1
libstdc++-v3/testsuite/23_containers/unordered_multiset/96088.cc
View File

@ -1,4 +1,5 @@
// { dg-do run { target c++17 } }
// { dg-require-effective-target std_allocator_new }
// Copyright (C) 2021 Free Software Foundation, Inc.
//

1
libstdc++-v3/testsuite/23_containers/unordered_set/96088.cc
View File

@ -1,4 +1,5 @@
// { dg-do run { target c++17 } }
// { dg-require-effective-target std_allocator_new }
// Copyright (C) 2021 Free Software Foundation, Inc.
//

1
libstdc++-v3/testsuite/ext/throw_allocator/check_delete.cc
View File

@ -18,6 +18,7 @@
// { dg-require-time "" }
// { dg-require-cstdint "" }
// { dg-require-effective-target std_allocator_new }
#include <cstdlib>
#include <ext/throw_allocator.h>

1
libstdc++-v3/testsuite/ext/throw_allocator/check_new.cc
View File

@ -18,6 +18,7 @@
// { dg-require-time "" }
// { dg-require-cstdint "" }
// { dg-require-effective-target std_allocator_new }
#include <cstdlib>
#include <ext/throw_allocator.h>

8
libstdc++-v3/testsuite/lib/libstdc++.exp
View File

@ -1338,6 +1338,14 @@ proc check_effective_target_net_ts_ip { } {
}]
}
# Return 1 if libstdc++ was built as --enable-libstdcxx-allocator=new
proc check_effective_target_std_allocator_new { } {
return [check_v3_target_prop_cached et_std_alloc_new {
set cond "_GLIBCXX_USE_ALLOCATOR_NEW"
return [v3_check_preprocessor_condition std_alloc_new $cond]
}]
}
set additional_prunes ""
if { [info exists env(GCC_RUNTEST_PARALLELIZE_DIR)] \