OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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).

	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: r265423
This commit is contained in:
Jonathan Wakely 2018-10-23 14:10:26 +01:00 committed by Jonathan Wakely
parent 99c24b911b
commit c3ba63c314
3 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
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.
2018-10-20 François Dumont <fdumont@gcc.gnu.org> 2018-10-20 François Dumont <fdumont@gcc.gnu.org>
* testsuite/util/testsuite_containers.h * testsuite/util/testsuite_containers.h

12
libstdc++-v3/include/bits/unique_ptr.h
View File

@ -195,7 +195,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Del = _Dp, typename = _DeleterConstraint<_Del>> template<typename _Del = _Dp, typename = _DeleterConstraint<_Del>>
constexpr unique_ptr() noexcept constexpr unique_ptr() noexcept
: _M_t() : _M_t()
{ } { }
/** Takes ownership of a pointer. /** Takes ownership of a pointer.
* *
@ -244,7 +244,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// Creates a unique_ptr that owns nothing. /// Creates a unique_ptr that owns nothing.
template<typename _Del = _Dp, typename = _DeleterConstraint<_Del>> template<typename _Del = _Dp, typename = _DeleterConstraint<_Del>>
constexpr unique_ptr(nullptr_t) noexcept : unique_ptr() { } constexpr unique_ptr(nullptr_t) noexcept
: _M_t()
{ }
// Move constructors. // Move constructors.
@ -472,7 +474,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Del = _Dp, typename = _DeleterConstraint<_Del>> template<typename _Del = _Dp, typename = _DeleterConstraint<_Del>>
constexpr unique_ptr() noexcept constexpr unique_ptr() noexcept
: _M_t() : _M_t()
{ } { }
/** Takes ownership of a pointer. /** Takes ownership of a pointer.
* *
@ -535,7 +537,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// Creates a unique_ptr that owns nothing. /// Creates a unique_ptr that owns nothing.
template<typename _Del = _Dp, typename = _DeleterConstraint<_Del>> template<typename _Del = _Dp, typename = _DeleterConstraint<_Del>>
constexpr unique_ptr(nullptr_t) noexcept : unique_ptr() { } constexpr unique_ptr(nullptr_t) noexcept
: _M_t()
{ }
template<typename _Up, typename _Ep, template<typename _Up, typename _Ep,
typename = _Require<__safe_conversion_up<_Up, _Ep>>> typename = _Require<__safe_conversion_up<_Up, _Ep>>>

32
libstdc++-v3/testsuite/20_util/unique_ptr/cons/incomplete.cc Normal file
View File

@ -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);
}