mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-05 01:34:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

re PR libstdc++/54351 (~unique_ptr() should not set stored pointer to null)

Browse Source 
PR libstdc++/54351
	* include/bits/unique_ptr.h (unique_ptr<T>::~unique_ptr): Do not use
	reset().
	(unique_ptr<T[]>::~unique_ptr()): Likewise.
	* testsuite/20_util/unique_ptr/54351.cc: New.
	* testsuite/20_util/unique_ptr/assign/48635_neg.cc: Adjust dg-error
	line numbers.

From-SVN: r190676
This commit is contained in:
Jonathan Wakely 2012-08-26 00:12:40 +00:00 committed by Jonathan Wakely
parent b5106d10ed
commit 6d79ba303c
4 changed files with 96 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,13 @@
2012-08-26 Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/54351
* include/bits/unique_ptr.h (unique_ptr<T>::~unique_ptr): Do not use
reset().
(unique_ptr<T[]>::~unique_ptr()): Likewise.
* testsuite/20_util/unique_ptr/54351.cc: New.
* testsuite/20_util/unique_ptr/assign/48635_neg.cc: Adjust dg-error
line numbers.
2012-08-25 Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/54297

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

@ -169,7 +169,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif
// Destructor.
~unique_ptr() noexcept { reset(); }
~unique_ptr() noexcept
{
auto& __ptr = std::get<0>(_M_t);
if (__ptr != nullptr)
get_deleter()(__ptr);
__ptr = pointer();
}
// Assignment.
unique_ptr&
@ -313,7 +319,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ }
// Destructor.
~unique_ptr() { reset(); }
~unique_ptr()
{
auto& __ptr = std::get<0>(_M_t);
if (__ptr != nullptr)
get_deleter()(__ptr);
__ptr = pointer();
}
// Assignment.
unique_ptr&

70
libstdc++-v3/testsuite/20_util/unique_ptr/54351.cc Normal file
View File

@ -0,0 +1,70 @@
// { dg-options "-std=gnu++0x" }
// { dg-do run }
// Copyright (C) 2012 Free Software Foundation
//
// 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/>.
// 20.7.1 Template class unique_ptr [unique.ptr]
#include <memory>
#include <testsuite_hooks.h>
struct A;
struct B
{
std::unique_ptr<A> a;
};
struct A
{
B* b;
~A() { VERIFY(b->a != nullptr); }
};
void test01()
{
B b;
b.a.reset(new A);
b.a->b = &b;
}
struct C;
struct D
{
std::unique_ptr<C[]> c;
};
struct C
{
D* d;
~C() { VERIFY(d->c != nullptr); }
};
void test02()
{
D d;
d.c.reset(new C[1]);
d.c[0].d = &d;
}
int main()
{
test01();
test02();
}

4
libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc
View File

@ -41,10 +41,10 @@ void f()
std::unique_ptr<int, B&> ub(nullptr, b);
std::unique_ptr<int, D&> ud(nullptr, d);
ub = std::move(ud);
// { dg-error "use of deleted function" "" { target *-*-* } 192 }
// { dg-error "use of deleted function" "" { target *-*-* } 198 }
std::unique_ptr<int[], B&> uba(nullptr, b);
std::unique_ptr<int[], D&> uda(nullptr, d);
uba = std::move(uda);
// { dg-error "use of deleted function" "" { target *-*-* } 332 }
// { dg-error "use of deleted function" "" { target *-*-* } 344 }
}