From d7c1581c048bbcb391d6cdf0c5327dd91fee5252 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 15 Jan 2016 23:12:13 +0000 Subject: [PATCH] Use static assertion for uses-allocator construction PR libstdc++/69293 * include/bits/uses_allocator.h (__uses_alloc): Add static assertion that type is constructible from the arguments. * testsuite/20_util/scoped_allocator/69293_neg.cc: New. * testsuite/20_util/uses_allocator/69293_neg.cc: New. * testsuite/20_util/uses_allocator/cons_neg.cc: Adjust dg-error. From-SVN: r232457 --- libstdc++-v3/ChangeLog | 7 +++ libstdc++-v3/include/bits/uses_allocator.h | 7 ++- .../20_util/scoped_allocator/69293_neg.cc | 51 +++++++++++++++++++ .../20_util/uses_allocator/69293_neg.cc | 49 ++++++++++++++++++ .../20_util/uses_allocator/cons_neg.cc | 2 +- 5 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/scoped_allocator/69293_neg.cc create mode 100644 libstdc++-v3/testsuite/20_util/uses_allocator/69293_neg.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5e293546e98..4f1687553ed 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,12 @@ 2016-01-15 Jonathan Wakely + PR libstdc++/69293 + * include/bits/uses_allocator.h (__uses_alloc): Add + static assertion that type is constructible from the arguments. + * testsuite/20_util/scoped_allocator/69293_neg.cc: New. + * testsuite/20_util/uses_allocator/69293_neg.cc: New. + * testsuite/20_util/uses_allocator/cons_neg.cc: Adjust dg-error. + PR libstdc++/69294 * acinclude.m4 (GLIBCXX_CHECK_MATH11_PROTO): Check for obsolete isinf and isnan on AIX. Quote variables. diff --git a/libstdc++-v3/include/bits/uses_allocator.h b/libstdc++-v3/include/bits/uses_allocator.h index 70ba0076a16..b1ff58a294b 100644 --- a/libstdc++-v3/include/bits/uses_allocator.h +++ b/libstdc++-v3/include/bits/uses_allocator.h @@ -85,7 +85,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION is_constructible<_Tp, allocator_arg_t, _Alloc, _Args...>::value, __uses_alloc1<_Alloc>, __uses_alloc2<_Alloc>>::type - { }; + { + static_assert(__or_< + is_constructible<_Tp, allocator_arg_t, _Alloc, _Args...>, + is_constructible<_Tp, _Args..., _Alloc>>::value, "construction with" + " an allocator must be possible if uses_allocator is true"); + }; template struct __uses_alloc diff --git a/libstdc++-v3/testsuite/20_util/scoped_allocator/69293_neg.cc b/libstdc++-v3/testsuite/20_util/scoped_allocator/69293_neg.cc new file mode 100644 index 00000000000..f3b2d87ab99 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/scoped_allocator/69293_neg.cc @@ -0,0 +1,51 @@ +// Copyright (C) 2016 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// PR libstdc++/69293 + +#include +#include + +using std::allocator; +using std::allocator_arg_t; +using std::uses_allocator; +using std::scoped_allocator_adaptor; +using std::is_constructible; + +struct X +{ + using allocator_type = allocator; +}; + +using scoped_alloc = scoped_allocator_adaptor, X::allocator_type>; +using inner_alloc_type = scoped_alloc::inner_allocator_type; + +static_assert(uses_allocator{}, ""); +static_assert(!is_constructible{}, ""); +static_assert(!is_constructible{}, ""); + +void +test01() +{ + scoped_alloc sa; + auto p = sa.allocate(1); + sa.construct(p); // this is required to be ill-formed + // { dg-error "static assertion failed" "" { target *-*-* } 89 } +} diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/69293_neg.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/69293_neg.cc new file mode 100644 index 00000000000..19417fc2cef --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/uses_allocator/69293_neg.cc @@ -0,0 +1,49 @@ +// Copyright (C) 2016 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// PR libstdc++/69293 + +#include +#include + +using std::allocator; +using std::allocator_arg_t; +using std::uses_allocator; +using std::tuple; +using std::is_constructible; + +struct X +{ + using allocator_type = allocator; +}; + +using alloc_type = X::allocator_type; + +static_assert(uses_allocator{}, ""); +static_assert(!is_constructible{}, ""); +static_assert(!is_constructible{}, ""); + +void +test01() +{ + alloc_type a; + std::tuple t(std::allocator_arg, a); // this is required to be ill-formed + // { dg-error "static assertion failed" "" { target *-*-* } 89 } +} diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/cons_neg.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/cons_neg.cc index 00f96d684b8..b3df4ae9d7d 100644 --- a/libstdc++-v3/testsuite/20_util/uses_allocator/cons_neg.cc +++ b/libstdc++-v3/testsuite/20_util/uses_allocator/cons_neg.cc @@ -44,4 +44,4 @@ void test01() tuple t(allocator_arg, a, 1); } -// { dg-error "no matching function" "" { target *-*-* } 92 } +// { dg-error "static assertion failed" "" { target *-*-* } 89 } -- 2.30.2