Patchwork [v3] fix PR 54351

login
register
mail settings
Submitter Jonathan Wakely
Date Aug. 26, 2012, 12:16 a.m.
Message ID <CAH6eHdQwO68J7cPGE6hUqwqWmtYU3kq09Q28hmCU2AZDHsPjxw@mail.gmail.com>
Download mbox | patch
Permalink /patch/180008/
State New
Headers show

Comments

Jonathan Wakely - Aug. 26, 2012, 12:16 a.m.
2012-08-26  Jonathan Wakely  <jwakely.gcc@gmail.com>
            Geoff Romer  <gromer@google.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.

Tested x86_64-linux, committed to trunk, will commit to 4.7 too.
commit d88d836f7398e0e81ef8c0c2d08abfbe16489024
Author: Jonathan Wakely <jwakely.gcc@gmail.com>
Date:   Sat Aug 25 21:00:24 2012 +0100

    	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.

Patch

diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h
index 242d01e..37eae25 100644
--- a/libstdc++-v3/include/bits/unique_ptr.h
+++ b/libstdc++-v3/include/bits/unique_ptr.h
@@ -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&
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/54351.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/54351.cc
new file mode 100644
index 0000000..2565e62
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/54351.cc
@@ -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();
+}
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 d72821e..3a4f9b4 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<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 }
 }