Only set std::enable_shared_from_this member once.
authorJonathan Wakely <jwakely@redhat.com>
Wed, 26 Aug 2015 21:27:00 +0000 (22:27 +0100)
committerJonathan Wakely <redi@gcc.gnu.org>
Wed, 26 Aug 2015 21:27:00 +0000 (22:27 +0100)
* include/bits/shared_ptr.h (__enable_shared_from_this_helper): Use
nullptr.
* include/bits/shared_ptr_base.h (weak_ptr::_M_assign): Don't assign
if ownership is already shared with a shared_ptr object.
(__enable_shared_from_this_helper): Use nullptr.
* testsuite/20_util/enable_shared_from_this/members/const.cc: New.
* testsuite/20_util/enable_shared_from_this/members/reinit.cc: New.
* testsuite/20_util/enable_shared_from_this/requirements/
explicit_instantiation.cc: Instantiate with const and incomplete types.

From-SVN: r227232

libstdc++-v3/ChangeLog
libstdc++-v3/include/bits/shared_ptr.h
libstdc++-v3/include/bits/shared_ptr_base.h
libstdc++-v3/testsuite/20_util/enable_shared_from_this/members/const.cc [new file with mode: 0644]
libstdc++-v3/testsuite/20_util/enable_shared_from_this/members/reinit.cc [new file with mode: 0644]
libstdc++-v3/testsuite/20_util/enable_shared_from_this/requirements/explicit_instantiation.cc

index 0bc0aca0211dc873559c46d66fb4974099790e64..0e99af68374c5034c639aa36ac9e839d57bd8a79 100644 (file)
@@ -1,5 +1,15 @@
 2015-08-26  Jonathan Wakely  <jwakely@redhat.com>
 
+       * include/bits/shared_ptr.h (__enable_shared_from_this_helper): Use
+       nullptr.
+       * include/bits/shared_ptr_base.h (weak_ptr::_M_assign): Don't assign
+       if ownership is already shared with a shared_ptr object.
+       (__enable_shared_from_this_helper): Use nullptr.
+       * testsuite/20_util/enable_shared_from_this/members/const.cc: New.
+       * testsuite/20_util/enable_shared_from_this/members/reinit.cc: New.
+       * testsuite/20_util/enable_shared_from_this/requirements/
+       explicit_instantiation.cc: Instantiate with const and incomplete types.
+
        * include/debug/map.h (map::try_emplace, map::insert_or_assign):
        Define.
        * include/debug/unordered_map (unordered_map::try_emplace,
index f96c07835b625b60d32fb96a6d901a0aa299589a..2413b1b8e101ee2e46b66113644f245fcf129767 100644 (file)
@@ -588,7 +588,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                                         const enable_shared_from_this* __pe,
                                         const _Tp1* __px) noexcept
        {
-         if (__pe != 0)
+         if (__pe != nullptr)
            __pe->_M_weak_assign(const_cast<_Tp1*>(__px), __pn);
        }
 
index aec10fecdbf52a013bca57546d6ee9fca13cc989..820edcb5d4b09a00cd9a685a9b4f63ac7eee8445 100644 (file)
@@ -1468,8 +1468,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       void
       _M_assign(_Tp* __ptr, const __shared_count<_Lp>& __refcount) noexcept
       {
-       _M_ptr = __ptr;
-       _M_refcount = __refcount;
+       if (use_count() == 0)
+         {
+           _M_ptr = __ptr;
+           _M_refcount = __refcount;
+         }
       }
 
       template<typename _Tp1, _Lock_policy _Lp1> friend class __shared_ptr;
@@ -1549,7 +1552,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                                         const __enable_shared_from_this* __pe,
                                         const _Tp1* __px) noexcept
        {
-         if (__pe != 0)
+         if (__pe != nullptr)
            __pe->_M_weak_assign(const_cast<_Tp1*>(__px), __pn);
        }
 
diff --git a/libstdc++-v3/testsuite/20_util/enable_shared_from_this/members/const.cc b/libstdc++-v3/testsuite/20_util/enable_shared_from_this/members/const.cc
new file mode 100644 (file)
index 0000000..fdf39c7
--- /dev/null
@@ -0,0 +1,60 @@
+// Copyright (C) 2015 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-options "-std=gnu++11" }
+
+#include <memory>
+#include <testsuite_hooks.h>
+
+template<typename T, typename U>
+  bool
+  share_ownership(const std::shared_ptr<T>& p1, const std::shared_ptr<U>& p2)
+  {
+    return !p1.owner_before(p2) && !p2.owner_before(p1);
+  }
+
+void
+test01()
+{
+  struct X : public std::enable_shared_from_this<X> { };
+  using CX = const X;
+  std::shared_ptr<CX> p(new X);
+  VERIFY( share_ownership(p->shared_from_this(), p) );
+  p.reset(new CX);
+  VERIFY( share_ownership(p->shared_from_this(), p) );
+  auto p2 = std::const_pointer_cast<X>(p)->shared_from_this();
+  VERIFY( share_ownership(p2, p) );
+}
+
+void
+test02()
+{
+  struct X;
+  using CX = const X;
+  struct X : public std::enable_shared_from_this<CX> { };
+  std::shared_ptr<CX> p(new X);
+  VERIFY( share_ownership(p->shared_from_this(), p) );
+  p.reset(new CX);
+  VERIFY( share_ownership(p->shared_from_this(), p) );
+}
+
+int
+main()
+{
+  test01();
+  test02();
+}
diff --git a/libstdc++-v3/testsuite/20_util/enable_shared_from_this/members/reinit.cc b/libstdc++-v3/testsuite/20_util/enable_shared_from_this/members/reinit.cc
new file mode 100644 (file)
index 0000000..3740db8
--- /dev/null
@@ -0,0 +1,49 @@
+// Copyright (C) 2015 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-options "-std=gnu++11" }
+
+#include <memory>
+#include <testsuite_hooks.h>
+
+struct X : public std::enable_shared_from_this<X> { };
+
+bool
+share_ownership(const std::shared_ptr<X>& p1, const std::shared_ptr<X>& p2)
+{
+  return !p1.owner_before(p2) && !p2.owner_before(p1);
+}
+
+void
+test01()
+{
+  std::shared_ptr<X> p1(new X);
+  VERIFY( share_ownership( p1->shared_from_this(), p1 ) );
+  {
+    std::shared_ptr<X> p2(p1.get(), [](X*){});
+    // The weak_ptr member of the enable_shared_from_this base should not
+    // be reset by creating a second control block that owns the pointer.
+    VERIFY( share_ownership( p2->shared_from_this(), p1 ) );
+  }
+  VERIFY( share_ownership( p1->shared_from_this(), p1 ) );
+}
+
+int
+main()
+{
+  test01();
+}
index 270ee8409b9bfe5bf56284e3388f5d7dd4f52b10..94638e192426eee5b87eb6fb661aab52063008f0 100644 (file)
@@ -21,3 +21,8 @@
 #include <memory>
 
 template class std::enable_shared_from_this<int>;
+template class std::enable_shared_from_this<const int>;
+
+class Incomplete;
+template class std::enable_shared_from_this<Incomplete>;
+template class std::enable_shared_from_this<const Incomplete>;