final_virtual_ptr: add sanity checks

Author: jll63

include/boost/openmethod/core.hpp

@@ -578,6 +578,13 @@ inline auto final_virtual_ptr(Arg&& obj) {
     using Traits = virtual_traits<Arg, Registry>;
     using Class = typename Traits::virtual_type;
 
+    static_assert(!std::is_const_v<Class>);
+    static_assert(!std::is_volatile_v<Class>);
+    static_assert(!std::is_reference_v<Class>);
+    static_assert(!std::is_pointer_v<Class>);
+
+    Registry::require_initialized();
+
     if constexpr (
         Registry::has_runtime_checks &&
         Registry::rtti::template is_polymorphic<Class>) {
@@ -598,10 +605,12 @@ inline auto final_virtual_ptr(Arg&& obj) {
         }
     }
 
+    const vptr_type& vptr = Registry::template static_vptr<Class>;
+    BOOST_ASSERT(vptr);
+
     return VirtualPtr(
         std::forward<Arg>(obj),
-        detail::box_vptr<VirtualPtr::use_indirect_vptrs>(
-            Registry::template static_vptr<Class>));
+        detail::box_vptr<VirtualPtr::use_indirect_vptrs>(vptr));
 }
 
 //! Create a `virtual_ptr` for an object of a known dynamic type.
@@ -610,12 +619,13 @@ inline auto final_virtual_ptr(Arg&& obj) {
 //! registry as the `Registry` template parameter.
 //!
 //! @see @ref final_virtual_ptr
+// We could give a default value to Registry in the main template, but gcc
+// doesn't like it.
 template<class Arg>
 inline auto final_virtual_ptr(Arg&& obj) {
     return final_virtual_ptr<BOOST_OPENMETHOD_DEFAULT_REGISTRY, Arg>(
         std::forward<Arg>(obj));
 }
-
 //! Wide pointer combining pointers to an object and its v-table
 //!
 //! A `virtual_ptr` is a wide pointer that combines pointers to an object and

test/test_shared_virtual_ptr_value_semantics.cpp

@@ -258,14 +258,14 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(
     }
 
     {
-        auto p = make_shared_virtual<Dog>();
+        auto p = make_shared_virtual<Dog, Registry>();
         p = nullptr;
         BOOST_TEST(p.get() == nullptr);
         BOOST_TEST(p.vptr() == nullptr);
     }
 
     {
-        auto p = make_shared_virtual<Dog>();
+        auto p = make_shared_virtual<Dog, Registry>();
         p = std::shared_ptr<Dog>();
         BOOST_TEST(p.get() == nullptr);
         BOOST_TEST(p.vptr() == nullptr);
@@ -278,13 +278,17 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(
 }
 
 BOOST_AUTO_TEST_CASE(cast_shared_ptr_value) {
+    init_test<default_registry>();
+
     std::shared_ptr<Animal> animal = std::make_shared<Dog>();
     auto dog = virtual_traits<std::shared_ptr<Animal>, default_registry>::cast<
         std::shared_ptr<Dog>>(animal);
     BOOST_TEST(dog.get() == animal.get());
 }
 
 BOOST_AUTO_TEST_CASE(cast_shared_ptr_lvalue_reference) {
+    init_test<default_registry>();
+
     std::shared_ptr<Animal> animal = std::make_shared<Dog>();
     auto dog =
         virtual_traits<const std::shared_ptr<Animal>&, default_registry>::cast<
@@ -293,13 +297,17 @@ BOOST_AUTO_TEST_CASE(cast_shared_ptr_lvalue_reference) {
 }
 
 bool cast_moves() {
+    init_test<default_registry>();
+
     std::shared_ptr<Animal> animal = std::make_shared<Dog>();
     (void)std::static_pointer_cast<Dog>(animal);
 
     return animal.get() == nullptr;
 }
 
 BOOST_AUTO_TEST_CASE(cast_shared_ptr_xvalue_reference) {
+    init_test<default_registry>();
+
     std::shared_ptr<Animal> animal = std::make_shared<Dog>();
     auto p = animal.get();
     auto dog = virtual_traits<std::shared_ptr<Animal>, default_registry>::cast<
@@ -313,6 +321,8 @@ BOOST_AUTO_TEST_CASE(cast_shared_ptr_xvalue_reference) {
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(
     cast_shared_virtual_ptr_value, Class, test_classes) {
+    init_test<default_registry>();
+
     shared_virtual_ptr<Animal> base = make_shared_virtual<Class>();
     auto derived =
         virtual_traits<shared_virtual_ptr<Animal>, default_registry>::cast<
@@ -324,6 +334,8 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(
     cast_shared_virtual_ptr_lvalue_reference, Class, test_classes) {
+    init_test<default_registry>();
+
     shared_virtual_ptr<Animal> base = make_shared_virtual<Class>();
     auto derived =
         virtual_traits<const shared_virtual_ptr<Animal>&, default_registry>::
@@ -335,6 +347,8 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(
     cast_shared_virtual_ptr_xvalue_reference, Class, test_classes) {
+    init_test<default_registry>();
+
     shared_virtual_ptr<Animal> base = make_shared_virtual<Class>();
     auto p = base.get();
     auto derived =

test/test_unique_virtual_ptr_value_semantics.cpp

@@ -260,13 +260,15 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(
     cast_unique_virtual_ptr_value, Class, test_classes) {
+    init_test<default_registry>();
+
     unique_virtual_ptr<Animal> base = make_unique_virtual<Class>();
     auto p = base.get();
     auto derived =
         virtual_traits<unique_virtual_ptr<Animal>, default_registry>::cast<
             unique_virtual_ptr<Class>>(std::move(base));
     BOOST_TEST(derived.get() == p);
-    BOOST_TEST(derived.vptr() == default_registry::static_vptr<Dog>);
+    BOOST_TEST(derived.vptr() == default_registry::static_vptr<Class>);
     BOOST_TEST(base.get() == nullptr);
 }