No longer maintain Godot ref-count in InstanceStorage

Extra state to keep in sync, which is already available as RefCounted::get_reference_count().
Also, the reference() and unreference() callbacks aren't invoked on every refcount operation,
only for low numbers; otherwise GDExtension may not witness a change.

� Conflicts:
�	godot-core/src/storage/multi_threaded.rs
�	godot-core/src/storage/single_threaded.rs

Author: Bromeon

godot-core/src/storage/instance_storage.rs

@@ -154,9 +154,6 @@ pub unsafe trait Storage {
 
 /// An internal trait for keeping track of reference counts for a storage.
 pub(crate) trait StorageRefCounted: Storage {
-    #[allow(dead_code)] // used in `debug-log` feature. Don't micromanage.
-    fn godot_ref_count(&self) -> u32;
-
     fn on_inc_ref(&self);
 
     fn on_dec_ref(&self);

godot-core/src/storage/mod.rs

@@ -65,24 +65,22 @@ mod log_active {
 
     pub fn log_construct<T: GodotClass>(base: &Base<T::Base>) {
         out!(
-            "    Storage::construct:             {base:?}  (T={ty})",
+            "    Storage::construct:   {base:?}  (T={ty})",
             ty = type_name::<T>()
         );
     }
 
     pub fn log_inc_ref<T: StorageRefCounted>(storage: &T) {
         out!(
-            "    Storage::on_inc_ref (rc={rc}):  {base:?}  (T={ty})",
-            rc = T::godot_ref_count(storage),
+            "    Storage::on_inc_ref:  {base:?}  (T={ty})",
             base = storage.base(),
             ty = type_name::<T>(),
         );
     }
 
     pub fn log_dec_ref<T: StorageRefCounted>(storage: &T) {
         out!(
-            "  | Storage::on_dec_ref (rc={rc}):  {base:?}  (T={ty})",
-            rc = T::godot_ref_count(storage),
+            "  | Storage::on_dec_ref:  {base:?}  (T={ty})",
             base = storage.base(),
             ty = type_name::<T>(),
         );
@@ -103,8 +101,7 @@ mod log_active {
         // Do not Debug-fmt `self.base()` object here, see above.
 
         out!(
-            "    Storage::drop (rc={rc}):        {base_id}",
-            rc = storage.godot_ref_count(),
+            "    Storage::drop:        {base_id}",
             base_id = storage.base().debug_instance_id(),
         );
     }

godot-core/src/storage/multi_threaded.rs

@@ -5,8 +5,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-use std::sync::atomic::{AtomicU32, Ordering};
-
 #[cfg(not(feature = "experimental-threads"))]
 use godot_cell::panicking::{GdCell, InaccessibleGuard, MutGuard, RefGuard};
 
@@ -22,7 +20,6 @@ pub struct InstanceStorage<T: GodotClass> {
 
     // Declared after `user_instance`, is dropped last
     pub(super) lifecycle: AtomicLifecycle,
-    godot_ref_count: AtomicU32,
 
     // No-op in Release mode.
     borrow_tracker: DebugBorrowTracker,
@@ -49,7 +46,6 @@ unsafe impl<T: GodotClass> Storage for InstanceStorage<T> {
             user_instance: GdCell::new(user_instance),
             base,
             lifecycle: AtomicLifecycle::new(Lifecycle::Alive),
-            godot_ref_count: AtomicU32::new(1),
             borrow_tracker: DebugBorrowTracker::new(),
         }
     }
@@ -104,19 +100,11 @@ unsafe impl<T: GodotClass> Storage for InstanceStorage<T> {
 }
 
 impl<T: GodotClass> StorageRefCounted for InstanceStorage<T> {
-    fn godot_ref_count(&self) -> u32 {
-        self.godot_ref_count.load(Ordering::Relaxed)
-    }
-
     fn on_inc_ref(&self) {
-        self.godot_ref_count.fetch_add(1, Ordering::Relaxed);
-
         super::log_inc_ref(self);
     }
 
     fn on_dec_ref(&self) {
-        self.godot_ref_count.fetch_sub(1, Ordering::Relaxed);
-
         super::log_dec_ref(self);
     }
 }

godot-core/src/storage/single_threaded.rs

@@ -22,7 +22,6 @@ pub struct InstanceStorage<T: GodotClass> {
 
     // Declared after `user_instance`, is dropped last
     pub(super) lifecycle: cell::Cell<Lifecycle>,
-    godot_ref_count: cell::Cell<u32>,
 
     // No-op in Release mode.
     borrow_tracker: DebugBorrowTracker,
@@ -49,7 +48,6 @@ unsafe impl<T: GodotClass> Storage for InstanceStorage<T> {
             user_instance: GdCell::new(user_instance),
             base,
             lifecycle: cell::Cell::new(Lifecycle::Alive),
-            godot_ref_count: cell::Cell::new(1),
             borrow_tracker: DebugBorrowTracker::new(),
         }
     }
@@ -101,21 +99,11 @@ unsafe impl<T: GodotClass> Storage for InstanceStorage<T> {
 }
 
 impl<T: GodotClass> StorageRefCounted for InstanceStorage<T> {
-    fn godot_ref_count(&self) -> u32 {
-        self.godot_ref_count.get()
-    }
-
     fn on_inc_ref(&self) {
-        let refc = self.godot_ref_count.get() + 1;
-        self.godot_ref_count.set(refc);
-
         super::log_inc_ref(self);
     }
 
     fn on_dec_ref(&self) {
-        let refc = self.godot_ref_count.get() - 1;
-        self.godot_ref_count.set(refc);
-
         super::log_dec_ref(self);
     }
 }