diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2018-10-25 17:41:54 +0100 |
---|---|---|
committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-10-25 17:41:54 +0100 |
commit | 74875207d8d36c3b8a0952ccde6b5115a9744f5c (patch) | |
tree | 346c4a76b65638f75432508284ab39eab74fe4f4 | |
parent | 7aec289640530c5e1cf9825ce91fc55d1483496d (diff) | |
download | gcc-74875207d8d36c3b8a0952ccde6b5115a9744f5c.tar.gz |
PR libstdc++/87704 fix unique_ptr(nullptr_t) constructors
Using a delegating constructor to implement these constructors means
that they instantiate the destructor, which requires the element_type to
be complete. In C++11 and C++14 they were specified to be delegating,
but that was changed as part of LWG 2801 so in C++17 they don't require
a complete type (as was intended all along).
Backport from mainline
2018-10-23 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/87704
* include/bits/unique_ptr.h (unique_ptr::unique_ptr(nullptr_t)): Do
not delegate to default constructor.
(unique_ptr<T[], D>::unique_ptr(nullptr_t)): Likewise.
* testsuite/20_util/unique_ptr/cons/incomplete.cc: New test.
From-SVN: r265499
-rw-r--r-- | libstdc++-v3/ChangeLog | 14 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/unique_ptr.h | 8 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc | 4 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc | 2 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/20_util/unique_ptr/cons/incomplete.cc | 32 |
5 files changed, 55 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4024fc9e449..eb2b9b3c2f8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2018-10-25 Jonathan Wakely <jwakely@redhat.com> + + + Backport from mainline + 2018-10-23 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/87704 + * include/bits/unique_ptr.h (unique_ptr::unique_ptr(nullptr_t)): Do + not delegate to default constructor. + (unique_ptr<T[], D>::unique_ptr(nullptr_t)): Likewise. + * testsuite/20_util/unique_ptr/cons/incomplete.cc: New test. + * testsuite/20_util/unique_ptr/assign/48635_neg.cc: Adjust dg-error. + * testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc: Likewise. + 2018-10-18 Jonathan Wakely <jwakely@redhat.com> Backport from mainline diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h index 8e302877f78..93c579788b6 100644 --- a/libstdc++-v3/include/bits/unique_ptr.h +++ b/libstdc++-v3/include/bits/unique_ptr.h @@ -201,7 +201,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION "rvalue deleter bound to reference"); } /// Creates a unique_ptr that owns nothing. - constexpr unique_ptr(nullptr_t) noexcept : unique_ptr() { } + constexpr unique_ptr(nullptr_t) noexcept : _M_t() + { static_assert(!is_pointer<deleter_type>::value, + "constructed with null function pointer deleter"); } // Move constructors. @@ -491,7 +493,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : _M_t(__u.release(), std::forward<deleter_type>(__u.get_deleter())) { } /// Creates a unique_ptr that owns nothing. - constexpr unique_ptr(nullptr_t) noexcept : unique_ptr() { } + constexpr unique_ptr(nullptr_t) noexcept : _M_t() + { static_assert(!is_pointer<deleter_type>::value, + "constructed with null function pointer deleter"); } template<typename _Up, typename _Ep, typename = _Require<__safe_conversion_up<_Up, _Ep>>> 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 785f9ad4cfd..e64b4535345 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 @@ -43,10 +43,10 @@ void f() std::unique_ptr<int, D&> ud(nullptr, d); ub = std::move(ud); // { dg-error "no match" } ub2 = ud; // { dg-error "no match" } -// { dg-error "no type" "" { target *-*-* } 272 } +// { dg-error "no type" "" { target *-*-* } 274 } std::unique_ptr<int[], B&> uba(nullptr, b); std::unique_ptr<int[], D&> uda(nullptr, d); uba = std::move(uda); // { dg-error "no match" } -// { dg-error "no type" "" { target *-*-* } 540 } +// { dg-error "no type" "" { target *-*-* } 544 } } diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc index 285a0b994c9..9b8cba45a57 100644 --- a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc @@ -40,7 +40,7 @@ test07() std::unique_ptr<const A[]> cA3(p); // { dg-error "no matching function" } std::unique_ptr<volatile A[]> vA3(p); // { dg-error "no matching function" } std::unique_ptr<const volatile A[]> cvA3(p); // { dg-error "no matching function" } - // { dg-error "no type" "" { target *-*-* } 448 } + // { dg-error "no type" "" { target *-*-* } 450 } } template<typename T> diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/incomplete.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/incomplete.cc new file mode 100644 index 00000000000..1a8f28838a1 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/incomplete.cc @@ -0,0 +1,32 @@ +// Copyright (C) 2018 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 +// <http://www.gnu.org/licenses/>. + +// { dg-do compile { target c++11 } } + +#include <memory> + +struct Incomplete; + +void f(void** p) +{ + ::new (p[0]) std::unique_ptr<Incomplete>(); + ::new (p[1]) std::unique_ptr<Incomplete[]>(); + + // PR libstdc++/87704 + ::new (p[2]) std::unique_ptr<Incomplete>(nullptr); + ::new (p[3]) std::unique_ptr<Incomplete[]>(nullptr); +} |