From 2705a8d66edb092fa6e8b3131049c2d495e4ea21 Mon Sep 17 00:00:00 2001 From: Daniel Krugler Date: Sat, 16 Apr 2011 00:55:43 +0000 Subject: [PATCH] re PR libstdc++/48635 ([C++0x] unique_ptr moves the deleter instead of copying it) 2011-04-15 Daniel Krugler Paolo Carlini PR libstdc++/48635 * include/bits/unique_ptr.h (unique_ptr<>::operator=(unique_ptr&&), unique_ptr<>::operator=(unique_ptr<>&&), unique_ptr<_Tp[],>::operator=(unique_ptr&&), unique_ptr<_Tp[],>::operator=(unique_ptr<>&&)): Forward the deleter instead of moving it. * testsuite/20_util/unique_ptr/assign/48635.cc: New. Co-Authored-By: Paolo Carlini From-SVN: r172532 --- libstdc++-v3/ChangeLog | 11 +++ libstdc++-v3/include/bits/unique_ptr.h | 8 +- .../20_util/unique_ptr/assign/48635.cc | 78 +++++++++++++++++++ 3 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4a581115f0b..bed5426044c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2011-04-15 Daniel Krugler + Paolo Carlini + + PR libstdc++/48635 + * include/bits/unique_ptr.h (unique_ptr<>::operator=(unique_ptr&&), + unique_ptr<>::operator=(unique_ptr<>&&), + unique_ptr<_Tp[],>::operator=(unique_ptr&&), + unique_ptr<_Tp[],>::operator=(unique_ptr<>&&)): Forward the deleter + instead of moving it. + * testsuite/20_util/unique_ptr/assign/48635.cc: New. + 2011-04-15 Rainer Orth * scripts/extract_symvers.pl: Handle NOTY. diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h index 9db634385c3..7df75ffc4bf 100644 --- a/libstdc++-v3/include/bits/unique_ptr.h +++ b/libstdc++-v3/include/bits/unique_ptr.h @@ -171,7 +171,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator=(unique_ptr&& __u) { reset(__u.release()); - get_deleter() = std::move(__u.get_deleter()); + get_deleter() = std::forward(__u.get_deleter()); return *this; } @@ -184,7 +184,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator=(unique_ptr<_Up, _Ep>&& __u) { reset(__u.release()); - get_deleter() = std::move(__u.get_deleter()); + get_deleter() = std::forward(__u.get_deleter()); return *this; } @@ -315,7 +315,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator=(unique_ptr&& __u) { reset(__u.release()); - get_deleter() = std::move(__u.get_deleter()); + get_deleter() = std::forward(__u.get_deleter()); return *this; } @@ -324,7 +324,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator=(unique_ptr<_Up, _Ep>&& __u) { reset(__u.release()); - get_deleter() = std::move(__u.get_deleter()); + get_deleter() = std::forward(__u.get_deleter()); return *this; } diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635.cc new file mode 100644 index 00000000000..99b412b58e8 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635.cc @@ -0,0 +1,78 @@ +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2011 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 +// . + +#include +#include + +struct Deleter +{ + Deleter() = default; + Deleter(const Deleter&) = default; + Deleter(Deleter&&) = default; + + Deleter& + operator=(const Deleter&) + { + bool test __attribute__((unused)) = true; + VERIFY( true ); + return *this; + } + + Deleter& + operator=(Deleter&&) + { + bool test __attribute__((unused)) = true; + VERIFY( false ); + return *this; + } + + template + void + operator()(T*) const { } +}; + +struct DDeleter : Deleter { }; + +// libstdc++/48635 +void test01() +{ + Deleter d; + + std::unique_ptr p1(nullptr, d), p2(nullptr, d); + p2 = std::move(p1); + + DDeleter dd; + + std::unique_ptr p1t(nullptr, dd); + std::unique_ptr p2t(nullptr, d); + p2t = std::move(p1t); + + std::unique_ptr p1a(nullptr, d), p2a(nullptr, d); + p2a = std::move(p1a); + + std::unique_ptr p1at(nullptr, dd); + std::unique_ptr p2at(nullptr, d); + p2at = std::move(p1at); +} + +int main() +{ + test01(); + return 0; +}