From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2136) id 24E203954422; Wed, 17 Jun 2020 19:01:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 24E203954422 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1592420506; bh=KcbyTaVvHBtW/miYRJ5sntlfGqqmwWUViep2i+EXuwM=; h=From:To:Subject:Date:From; b=TDoE4WxDba1+Y8t4tdbQTCPxt3hqK7yqQtdJxTbvdHNB0dy0hKSwfubDjGvI2eZwt Z237WxcesM29bhh4gMp3rgqwKmFT8WDFJY8pD08yhtBQpGTOlY/0h5EWMSFom+pTf+ 5ClVpPoS0PIpZITVs/YFXDOxn5jJoikFpZ7xFXy0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Aldy Hernandez To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/ranger] libstdc++: make polymorphic_allocator throw consistent type (LWG 3237) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/devel/ranger X-Git-Oldrev: bb54e0b8794dfeea1f59ed9ca6433df1eccb85e9 X-Git-Newrev: e89100ef2efcf2bb1f1af1bdd81a1035d78f3fa4 Message-Id: <20200617190146.24E203954422@sourceware.org> Date: Wed, 17 Jun 2020 19:01:46 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2020 19:01:46 -0000 https://gcc.gnu.org/g:e89100ef2efcf2bb1f1af1bdd81a1035d78f3fa4 commit e89100ef2efcf2bb1f1af1bdd81a1035d78f3fa4 Author: Jonathan Wakely Date: Wed Feb 19 15:21:31 2020 +0000 libstdc++: make polymorphic_allocator throw consistent type (LWG 3237) * include/std/memory_resource (polymorphic_allocator::allocate) (polymorphic_allocator::allocate_object): Change type of exception to bad_array_new_length (LWG 3237). * testsuite/20_util/polymorphic_allocator/lwg3237.cc: New test. Diff: --- libstdc++-v3/ChangeLog | 5 ++ libstdc++-v3/include/std/memory_resource | 4 +- .../20_util/polymorphic_allocator/lwg3237.cc | 55 ++++++++++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bc4ce773f1e..067cf8343f6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2020-02-19 Jonathan Wakely + * include/std/memory_resource (polymorphic_allocator::allocate) + (polymorphic_allocator::allocate_object): Change type of exception to + bad_array_new_length (LWG 3237). + * testsuite/20_util/polymorphic_allocator/lwg3237.cc: New test. + * include/std/type_traits (__cpp_lib_unwrap_ref): Define (LWG 3348). * include/std/version (__cpp_lib_unwrap_ref): Likewise. * testsuite/20_util/unwrap_reference/1.cc: Check macro. diff --git a/libstdc++-v3/include/std/memory_resource b/libstdc++-v3/include/std/memory_resource index 73f77bdcadf..74683c5267f 100644 --- a/libstdc++-v3/include/std/memory_resource +++ b/libstdc++-v3/include/std/memory_resource @@ -167,7 +167,7 @@ namespace pmr __attribute__((__returns_nonnull__)) { if (__n > (__detail::__int_limits::max() / sizeof(_Tp))) - std::__throw_bad_alloc(); + _GLIBCXX_THROW_OR_ABORT(bad_array_new_length()); return static_cast<_Tp*>(_M_resource->allocate(__n * sizeof(_Tp), alignof(_Tp))); } @@ -193,7 +193,7 @@ namespace pmr allocate_object(size_t __n = 1) { if ((__detail::__int_limits::max() / sizeof(_Up)) < __n) - __throw_length_error("polymorphic_allocator::allocate_object"); + _GLIBCXX_THROW_OR_ABORT(bad_array_new_length()); return static_cast<_Up*>(allocate_bytes(__n * sizeof(_Up), alignof(_Up))); } diff --git a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/lwg3237.cc b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/lwg3237.cc new file mode 100644 index 00000000000..350f5ac9c95 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/lwg3237.cc @@ -0,0 +1,55 @@ +// Copyright (C) 2020 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++2a" } +// { dg-do run { target c++2a } } + +#include +#include + +struct large { alignas(1024) int i; }; + +void +test01() +{ + std::pmr::polymorphic_allocator a; + large* p = nullptr; + try + { + p = a.allocate(std::size_t(-1) / 256); + VERIFY( false ); + } + catch (const std::bad_array_new_length&) + { + } + + std::pmr::polymorphic_allocator a2; + try + { + p = a2.allocate_object(std::size_t(-1) / 256); + VERIFY( false ); + } + catch (const std::bad_array_new_length&) + { + } +} + +int +main() +{ + test01(); +}