Merge #173

173: Use instance_id_or_none in DynamicRefCount to fix #172 r=Bromeon a=WinstonHartnett

Closes #172

Co-authored-by: Winston Hartnett <[email protected]>

Author: bors[bot]

godot-core/src/obj/traits.rs

@@ -264,21 +264,33 @@ pub mod mem {
     impl Memory for DynamicRefCount {
         fn maybe_init_ref<T: GodotClass>(obj: &Gd<T>) {
             out!("  Dyn::init  <{}>", std::any::type_name::<T>());
-            if obj.instance_id().is_ref_counted() {
-                StaticRefCount::maybe_init_ref(obj);
+            if obj
+                .instance_id_or_none()
+                .map(|id| id.is_ref_counted())
+                .unwrap_or(false)
+            {
+                StaticRefCount::maybe_init_ref(obj)
             }
         }
 
         fn maybe_inc_ref<T: GodotClass>(obj: &Gd<T>) {
             out!("  Dyn::inc   <{}>", std::any::type_name::<T>());
-            if obj.instance_id().is_ref_counted() {
-                StaticRefCount::maybe_inc_ref(obj);
+            if obj
+                .instance_id_or_none()
+                .map(|id| id.is_ref_counted())
+                .unwrap_or(false)
+            {
+                StaticRefCount::maybe_inc_ref(obj)
             }
         }
 
         fn maybe_dec_ref<T: GodotClass>(obj: &Gd<T>) -> bool {
             out!("  Dyn::dec   <{}>", std::any::type_name::<T>());
-            if obj.instance_id().is_ref_counted() {
+            if obj
+                .instance_id_or_none()
+                .map(|id| id.is_ref_counted())
+                .unwrap_or(false)
+            {
                 StaticRefCount::maybe_dec_ref(obj)
             } else {
                 false

itest/rust/src/object_test.rs

@@ -531,6 +531,16 @@ fn object_engine_manual_free() {
     } // drop(node)
 }
 
+/// Tests the [`DynamicRefCount`] destructor when the underlying [`Object`] is already freed.
+#[itest]
+fn object_engine_shared_free() {
+    {
+        let node = Node::new_alloc();
+        let _object = node.share().upcast::<Object>();
+        node.free();
+    } // drop(_object)
+}
+
 #[itest]
 fn object_engine_manual_double_free() {
     expect_panic("double free()", || {