Implment managed object reference count

modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs

@@ -31,6 +31,8 @@ public sealed class Array :
 
         private WeakReference<IDisposable>? _weakReferenceToSelf;
 
+        internal int TypedWrapperReferenceCount;
+
         /// <summary>
         /// Constructs a new empty <see cref="Array"/>.
         /// </summary>
@@ -1052,7 +1054,8 @@ public sealed class Array<[MustBeVariant] T> :
         IReadOnlyList<T>,
         ICollection<T>,
         IEnumerable<T>,
-        IGenericGodotArray
+        IGenericGodotArray,
+        IDisposable
     {
         private static godot_variant ToVariantFunc(in Array<T> godotArray) =>
             VariantUtils.CreateFromArray(godotArray);
@@ -1067,6 +1070,7 @@ static unsafe Array()
         }
 
         private readonly Array _underlyingArray;
+        private bool _disposed;
 
         Array IGenericGodotArray.UnderlyingArray => _underlyingArray;
 
@@ -1083,6 +1087,7 @@ internal ref godot_array.movable NativeValue
         public Array()
         {
             _underlyingArray = new Array();
+            _underlyingArray.TypedWrapperReferenceCount++;
         }
 
         /// <summary>
@@ -1099,6 +1104,7 @@ public Array(IEnumerable<T> collection)
                 throw new ArgumentNullException(nameof(collection));
 
             _underlyingArray = new Array();
+            _underlyingArray.TypedWrapperReferenceCount++;
 
             foreach (T element in collection)
                 Add(element);
@@ -1118,6 +1124,7 @@ public Array(T[] array)
                 throw new ArgumentNullException(nameof(array));
 
             _underlyingArray = new Array();
+            _underlyingArray.TypedWrapperReferenceCount++;
 
             foreach (T element in array)
                 Add(element);
@@ -1137,6 +1144,7 @@ public Array(Array array)
                 throw new ArgumentNullException(nameof(array));
 
             _underlyingArray = array;
+            _underlyingArray.TypedWrapperReferenceCount++;
         }
 
         // Explicit name to make it very clear
@@ -1154,6 +1162,29 @@ internal static Array<T> CreateTakingOwnershipOfDisposableValue(godot_array nati
             return from?._underlyingArray;
         }
 
+        ~Array()
+        {
+            Dispose(false);
+        }
+
+        /// <summary>
+        /// Disposes of this <see cref="Array"/>.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        public void Dispose(bool disposing)
+        {
+            if(_disposed) return;
+            _disposed = true;
+            _underlyingArray.TypedWrapperReferenceCount--;
+            if(_underlyingArray.TypedWrapperReferenceCount > 0) return;
+            _underlyingArray.Dispose(disposing);
+        }
+
         /// <summary>
         /// Duplicates this <see cref="Array{T}"/>.
         /// </summary>

modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs

@@ -26,6 +26,8 @@ public sealed class Dictionary :
 
         private WeakReference<IDisposable>? _weakReferenceToSelf;
 
+        internal int TypedWrapperReferenceCount;
+
         /// <summary>
         /// Constructs a new empty <see cref="Dictionary"/>.
         /// </summary>
@@ -488,7 +490,8 @@ internal interface IGenericGodotDictionary
     public class Dictionary<[MustBeVariant] TKey, [MustBeVariant] TValue> :
         IDictionary<TKey, TValue>,
         IReadOnlyDictionary<TKey, TValue>,
-        IGenericGodotDictionary
+        IGenericGodotDictionary,
+        IDisposable
     {
         private static godot_variant ToVariantFunc(in Dictionary<TKey, TValue> godotDictionary) =>
             VariantUtils.CreateFromDictionary(godotDictionary);
@@ -503,6 +506,7 @@ static unsafe Dictionary()
         }
 
         private readonly Dictionary _underlyingDict;
+        private bool _disposed;
 
         Dictionary IGenericGodotDictionary.UnderlyingDictionary => _underlyingDict;
 
@@ -519,6 +523,7 @@ internal ref godot_dictionary.movable NativeValue
         public Dictionary()
         {
             _underlyingDict = new Dictionary();
+            _underlyingDict.TypedWrapperReferenceCount++;
         }
 
         /// <summary>
@@ -535,6 +540,7 @@ public Dictionary(IDictionary<TKey, TValue> dictionary)
                 throw new ArgumentNullException(nameof(dictionary));
 
             _underlyingDict = new Dictionary();
+            _underlyingDict.TypedWrapperReferenceCount++;
 
             foreach (KeyValuePair<TKey, TValue> entry in dictionary)
                 Add(entry.Key, entry.Value);
@@ -554,6 +560,7 @@ public Dictionary(Dictionary dictionary)
                 throw new ArgumentNullException(nameof(dictionary));
 
             _underlyingDict = dictionary;
+            _underlyingDict.TypedWrapperReferenceCount++;
         }
 
         // Explicit name to make it very clear
@@ -572,6 +579,29 @@ internal static Dictionary<TKey, TValue> CreateTakingOwnershipOfDisposableValue(
             return from?._underlyingDict;
         }
 
+        ~Dictionary()
+        {
+            Dispose(false);
+        }
+
+        /// <summary>
+        /// Disposes of this <see cref="Array"/>.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        public void Dispose(bool disposing)
+        {
+            if(_disposed) return;
+            _disposed = true;
+            _underlyingDict.TypedWrapperReferenceCount--;
+            if(_underlyingDict.TypedWrapperReferenceCount > 0) return;
+            _underlyingDict.Dispose(disposing);
+        }
+
         /// <summary>
         /// Returns a copy of the <see cref="Dictionary{TKey, TValue}"/>.
         /// If <paramref name="deep"/> is <see langword="true"/>, a deep copy is performed: