std::unique_ptr allows construction from std::unique_ptr of derived
type as per [unique.ptr.single.asgn] and [unique.ptr.single.ctor]. If
std::default_delete is used with std::unique_ptr, then after such
construction a delete is called on a pointer to base. According to
[expr.delete] calling a delete on a non similar object without a
virtual destructor is an undefined behavior.
This patch turns that undefined behavior into static assertions inside
std::unique_ptr.
Changelog:
* include/bits/unique_ptr.h: Add static asserts that
deleting by pointer to base in unique_ptr does not cause UB
* testsuite/20_util/unique_ptr/assign/slicing_neg.cc:
New test.
--
Best regards,
Antony Polukhin
diff --git a/libstdc++-v3/include/bits/unique_ptr.h
b/libstdc++-v3/include/bits/unique_ptr.h
index 6e55375..53a68f5 100644
--- a/libstdc++-v3/include/bits/unique_ptr.h
+++ b/libstdc++-v3/include/bits/unique_ptr.h
@@ -339,7 +339,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
is_convertible<_Ep, _Dp>>::type>>
unique_ptr(unique_ptr<_Up, _Ep>&& __u) noexcept
: _M_t(__u.release(), std::forward<_Ep>(__u.get_deleter()))
- { }
+ {
+ static_assert(!is_same<_Dp, default_delete<_Tp>>::value
+ || has_virtual_destructor<typename remove_cv<_Tp>::type>::value
+ || sizeof(_Tp) == sizeof(_Up),
+ "type of pointer owned by __u must be similar to the type of
pointer "
+ "owned by this object or the latter must have a virtual
destructor");
+ }
#if _GLIBCXX_USE_DEPRECATED
#pragma GCC diagnostic push
@@ -385,6 +391,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
unique_ptr&>::type
operator=(unique_ptr<_Up, _Ep>&& __u) noexcept
{
+ static_assert(!is_same<_Dp, default_delete<_Tp>>::value
+ || has_virtual_destructor<typename remove_cv<_Tp>::type>::value
+ || sizeof(_Tp) == sizeof(_Up),
+ "type of pointer owned by __u must be similar to the type of
pointer "
+ "owned by this object or the latter must have a virtual
destructor");
+
reset(__u.release());
get_deleter() = std::forward<_Ep>(__u.get_deleter());
return *this;
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/slicing_neg.cc
b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/slicing_neg.cc
new file mode 100644
index 0000000..e93483a
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/slicing_neg.cc
@@ -0,0 +1,86 @@
+// { dg-do compile { target c++11 } }
+// { dg-prune-output "virtual destructor" }
+
+// Copyright (C) 2021 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/>.
+
+#include <memory>
+
+struct A { };
+struct B : A { };
+struct C : B { int i; };
+
+struct Ac { char c; };
+struct Bc : Ac { };
+struct Cc : Bc { short s; };
+
+
+void test01()
+{
+ std::unique_ptr<B> upB;
+
+ std::unique_ptr<const A> cA;
+ cA = std::move(upB);
+
+ std::unique_ptr<volatile A> vA;
+ vA = std::move(upB);
+
+ std::unique_ptr<const volatile A> cvA;
+ cvA = std::move(upB);
+}
+
+void test02()
+{
+ std::unique_ptr<C> upC;
+
+ std::unique_ptr<const A> cA{std::move(upC)}; // { dg-error "required from
here" }
+ cA = std::move(upC); // { dg-error "required from here" }
+
+ std::unique_ptr<volatile A> vA{std::move(upC)}; // { dg-error "required
from here" }
+ vA = std::move(upC); // { dg-error "required from here" }
+
+ std::unique_ptr<const volatile A> cvA{std::move(upC)}; // { dg-error
"required from here" }
+ cvA = std::move(upC); // { dg-error "required from here" }
+}
+
+void test03()
+{
+ std::unique_ptr<Bc> upB;
+
+ std::unique_ptr<const Ac> cA;
+ cA = std::move(upB);
+
+ std::unique_ptr<volatile Ac> vA;
+ vA = std::move(upB);
+
+ std::unique_ptr<const volatile Ac> cvA;
+ cvA = std::move(upB);
+}
+
+void test04()
+{
+ std::unique_ptr<Cc> upC;
+
+ std::unique_ptr<const Ac> cA{std::move(upC)}; // { dg-error "required from
here" }
+ cA = std::move(upC); // { dg-error "required from here" }
+
+ std::unique_ptr<volatile Ac> vA{std::move(upC)}; // { dg-error "required
from here" }
+ vA = std::move(upC); // { dg-error "required from here" }
+
+ std::unique_ptr<const volatile Ac> cvA{std::move(upC)}; // { dg-error
"required from here" }
+ cvA = std::move(upC); // { dg-error "required from here" }
+}
