From: Jonathan Wakely Date: Wed, 30 Oct 2013 19:48:52 +0000 (+0000) Subject: shared_ptr (__shared_ptr): Assert non-void pointer. X-Git-Tag: releases/gcc-4.9.0~3136 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d52ed5c815d2dd68df04b621e1d339e54b938f9;p=thirdparty%2Fgcc.git shared_ptr (__shared_ptr): Assert non-void pointer. * include/bits/shared_ptr (__shared_ptr): Assert non-void pointer. * include/bits/shared_ptr (default_delete): Likewise. * testsuite/20_util/shared_ptr/cons/58839.cc: Do not use default_delete. * testsuite/20_util/shared_ptr/cons/void_neg.cc: New. * testsuite/20_util/default_delete/void_neg.cc: New. * testsuite/20_util/shared_ptr/cons/43820_neg.cc: Adjust line numbers. * testsuite/20_util/unique_ptr/assign/48635_neg.cc: Likewise. From-SVN: r204225 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1cc290a650fb..4a3b3584c03f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2013-10-30 Jonathan Wakely + + * include/bits/shared_ptr (__shared_ptr): Assert non-void pointer. + * include/bits/shared_ptr (default_delete): Likewise. + * testsuite/20_util/shared_ptr/cons/58839.cc: Do not use + default_delete. + * testsuite/20_util/shared_ptr/cons/void_neg.cc: New. + * testsuite/20_util/default_delete/void_neg.cc: New. + * testsuite/20_util/shared_ptr/cons/43820_neg.cc: Adjust line numbers. + * testsuite/20_util/unique_ptr/assign/48635_neg.cc: Likewise. + 2013-10-29 Jonathan Wakely PR libstdc++/58839 diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index 91b63677b738..cf90d7a7cb3a 100644 --- a/libstdc++-v3/include/bits/shared_ptr_base.h +++ b/libstdc++-v3/include/bits/shared_ptr_base.h @@ -775,6 +775,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : _M_ptr(__p), _M_refcount(__p) { __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>) + static_assert( !is_void<_Tp>::value, "incomplete type" ); static_assert( sizeof(_Tp1) > 0, "incomplete type" ); __enable_shared_from_this_helper(_M_refcount, __p, __p); } diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h index c6c9a5a04a5c..bfe40ecb9311 100644 --- a/libstdc++-v3/include/bits/unique_ptr.h +++ b/libstdc++-v3/include/bits/unique_ptr.h @@ -69,6 +69,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION void operator()(_Tp* __ptr) const { + static_assert(!is_void<_Tp>::value, + "can't delete pointer to incomplete type"); static_assert(sizeof(_Tp)>0, "can't delete pointer to incomplete type"); delete __ptr; diff --git a/libstdc++-v3/testsuite/20_util/default_delete/void_neg.cc b/libstdc++-v3/testsuite/20_util/default_delete/void_neg.cc new file mode 100644 index 000000000000..79786cbf9231 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/default_delete/void_neg.cc @@ -0,0 +1,30 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// Copyright (C) 2013 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 +// . + +// 20.8.1.1 Default deleters [util.ptr.dltr] + +#include + +void test01() +{ + std::default_delete d; + d(nullptr); // { dg-error "here" } + // { dg-error "incomplete" "" { target *-*-* } 72 } +} diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc index fd2a677e0c7b..db3fcaced525 100644 --- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc @@ -32,7 +32,7 @@ void test01() { X* px = 0; std::shared_ptr p1(px); // { dg-error "here" } - // { dg-error "incomplete" "" { target *-*-* } 778 } + // { dg-error "incomplete" "" { target *-*-* } 779 } std::shared_ptr p9(ap()); // { dg-error "here" } // { dg-error "incomplete" "" { target *-*-* } 307 } diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58839.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58839.cc index 6ad256461ea0..f78a07fb2c6e 100644 --- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58839.cc +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58839.cc @@ -22,8 +22,12 @@ // libstdc++/58839 +struct D { + void operator()(void*) const noexcept { } +}; + void test01() { - std::unique_ptr y; + std::unique_ptr y; std::shared_ptr x = std::move(y); } diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/void_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/void_neg.cc new file mode 100644 index 000000000000..3fd38cf2e622 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/void_neg.cc @@ -0,0 +1,29 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// Copyright (C) 2013 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 +// . + +// 20.8.2.2 Template class shared_ptr [util.smartptr.shared] + +#include + +void test01() +{ + std::shared_ptr p((void*)nullptr); // { dg-error "here" } + // { dg-error "incomplete" "" { target *-*-* } 778 } +} diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc index c78564270f41..fdffafceadb2 100644 --- a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc @@ -41,10 +41,10 @@ void f() std::unique_ptr ub(nullptr, b); std::unique_ptr ud(nullptr, d); ub = std::move(ud); -// { dg-error "use of deleted function" "" { target *-*-* } 270 } +// { dg-error "use of deleted function" "" { target *-*-* } 272 } std::unique_ptr uba(nullptr, b); std::unique_ptr uda(nullptr, d); uba = std::move(uda); -// { dg-error "use of deleted function" "" { target *-*-* } 515 } +// { dg-error "use of deleted function" "" { target *-*-* } 517 } }