[skip ci] Also exercise smart_holder::from_raw_ptr_take_ownership

Author: rwgk

tests/test_class_sh_mi_thunks.cpp

@@ -54,16 +54,22 @@ struct Diamond : Left, Right {
     int self_tag = 99;
 };
 
+// Factory that returns the *virtual base* type (raw pointer)
+VBase *make_diamond_as_vbase_raw_ptr() {
+    auto ptr = new Diamond;
+    return ptr; // upcast
+}
+
 // Factory that returns the *virtual base* type (shared_ptr)
 std::shared_ptr<VBase> make_diamond_as_vbase_shared_ptr() {
     auto shptr = std::make_shared<Diamond>();
-    return shptr; // upcast to VBase shared_ptr (virtual base)
+    return shptr; // upcast
 }
 
 // Factory that returns the *virtual base* type (unique_ptr)
 std::unique_ptr<VBase> make_diamond_as_vbase_unique_ptr() {
     auto uqptr = std::unique_ptr<Diamond>(new Diamond);
-    return uqptr; // upcast to VBase unique_ptr (virtual base)
+    return uqptr; // upcast
 }
 
 // For diagnostics / skip decisions in test
@@ -152,6 +158,9 @@ TEST_SUBMODULE(class_sh_mi_thunks, m) {
         .def(py::init<>())
         .def("ping", &Diamond::ping);
 
+    m.def("make_diamond_as_vbase_raw_ptr",
+          &make_diamond_as_vbase_raw_ptr,
+          py::return_value_policy::take_ownership);
     m.def("make_diamond_as_vbase_shared_ptr", &make_diamond_as_vbase_shared_ptr);
     m.def("make_diamond_as_vbase_unique_ptr", &make_diamond_as_vbase_unique_ptr);
 

tests/test_class_sh_mi_thunks.py

@@ -62,11 +62,12 @@ def test_virtual_base_at_offset_0():
 @pytest.mark.parametrize(
     "make_fn",
     [
+        m.make_diamond_as_vbase_raw_ptr,  # exercises smart_holder::from_raw_ptr_take_ownership
         m.make_diamond_as_vbase_shared_ptr,  # exercises smart_holder_from_shared_ptr
         m.make_diamond_as_vbase_unique_ptr,  # exercises smart_holder_from_unique_ptr
     ],
 )
-def test_shared_ptr_return_to_virtual_base_triggers_vi_path(make_fn):
+def test_make_diamond_as_vbase(make_fn):
     # See PR #5836 for background
     vb = make_fn()
     assert vb.ping() == 7