ClassGeneric.GetClass now returns BorrowedReference to indicate that the value should not be disposed

lostmsu · lostmsu · commit f48d7a96f76c · 2022-05-07T10:05:36.000-07:00
diff --git a/src/runtime/ClassManager.cs b/src/runtime/ClassManager.cs
@@ -133,7 +133,7 @@ internal static void RestoreRuntimeData(ClassManagerState storage)
         /// Return the ClassBase-derived instance that implements a particular
         /// reflected managed type, creating it if it doesn't yet exist.
         /// </summary>
-        internal static ReflectedClrType GetClass(Type type) => ReflectedClrType.GetOrCreate(type);
+        internal static BorrowedReference GetClass(Type type) => ReflectedClrType.GetOrCreate(type);
 
         internal static ClassBase GetClassImpl(Type type)
         {
diff --git a/src/runtime/Types/ClassObject.cs b/src/runtime/Types/ClassObject.cs
@@ -236,7 +236,7 @@ public override NewReference type_subscript(BorrowedReference idx)
                     return Exceptions.RaiseTypeError("type expected");
                 }
                 Type a = t.MakeArrayType();
-                PyType o = ClassManager.GetClass(a);
+                BorrowedReference o = ClassManager.GetClass(a);
                 return new NewReference(o);
             }
 
diff --git a/src/runtime/Types/ClrObject.cs b/src/runtime/Types/ClrObject.cs
@@ -43,13 +43,13 @@ internal static NewReference GetReference(object ob, BorrowedReference pyType)
 
         internal static NewReference GetReference(object ob, Type type)
         {
-            PyType cc = ClassManager.GetClass(type);
+            BorrowedReference cc = ClassManager.GetClass(type);
             return Create(ob, cc);
         }
 
         internal static NewReference GetReference(object ob)
         {
-            PyType cc = ClassManager.GetClass(ob.GetType());
+            BorrowedReference cc = ClassManager.GetClass(ob.GetType());
             return Create(ob, cc);
         }
 
diff --git a/src/runtime/Types/MethodObject.cs b/src/runtime/Types/MethodObject.cs
@@ -191,7 +191,7 @@ public static NewReference tp_descr_get(BorrowedReference ds, BorrowedReference
                 && obj.inst is IPythonDerivedType
                 && self.type.Value.IsInstanceOfType(obj.inst))
             {
-                var basecls = ClassManager.GetClass(self.type.Value);
+                var basecls = ReflectedClrType.GetOrCreate(self.type.Value);
                 return new MethodBinding(self, new PyObject(ob), basecls).Alloc();
             }
 
diff --git a/src/runtime/Types/ReflectedClrType.cs b/src/runtime/Types/ReflectedClrType.cs
@@ -12,6 +12,7 @@ internal sealed class ReflectedClrType : PyType
 {
     private ReflectedClrType(StolenReference reference) : base(reference, prevalidated: true) { }
     internal ReflectedClrType(ReflectedClrType original) : base(original, prevalidated: true) { }
+    internal ReflectedClrType(BorrowedReference original) : base(original) { }
     ReflectedClrType(SerializationInfo info, StreamingContext context) : base(info, context) { }
 
     internal ClassBase Impl => (ClassBase)ManagedType.GetManagedObject(this)!;

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ internal static void RestoreRuntimeData(ClassManagerState storage)`
`133`	`133`	`/// Return the ClassBase-derived instance that implements a particular`
`134`	`134`	`/// reflected managed type, creating it if it doesn't yet exist.`
`135`	`135`	`/// </summary>`
`136`		`- internal static ReflectedClrType GetClass(Type type) => ReflectedClrType.GetOrCreate(type);`
	`136`	`+ internal static BorrowedReference GetClass(Type type) => ReflectedClrType.GetOrCreate(type);`
`137`	`137`
`138`	`138`	`internal static ClassBase GetClassImpl(Type type)`
`139`	`139`	`{`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ public override NewReference type_subscript(BorrowedReference idx)`
`236`	`236`	`return Exceptions.RaiseTypeError("type expected");`
`237`	`237`	`}`
`238`	`238`	`Type a = t.MakeArrayType();`
`239`		`- PyType o = ClassManager.GetClass(a);`
	`239`	`+ BorrowedReference o = ClassManager.GetClass(a);`
`240`	`240`	`return new NewReference(o);`
`241`	`241`	`}`
`242`	`242`
Original file line number	Diff line number	Diff line change
`@@ -43,13 +43,13 @@ internal static NewReference GetReference(object ob, BorrowedReference pyType)`
`43`	`43`
`44`	`44`	`internal static NewReference GetReference(object ob, Type type)`
`45`	`45`	`{`
`46`		`- PyType cc = ClassManager.GetClass(type);`
	`46`	`+ BorrowedReference cc = ClassManager.GetClass(type);`
`47`	`47`	`return Create(ob, cc);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`internal static NewReference GetReference(object ob)`
`51`	`51`	`{`
`52`		`- PyType cc = ClassManager.GetClass(ob.GetType());`
	`52`	`+ BorrowedReference cc = ClassManager.GetClass(ob.GetType());`
`53`	`53`	`return Create(ob, cc);`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public static NewReference tp_descr_get(BorrowedReference ds, BorrowedReference`
`191`	`191`	`&& obj.inst is IPythonDerivedType`
`192`	`192`	`&& self.type.Value.IsInstanceOfType(obj.inst))`
`193`	`193`	`{`
`194`		`- var basecls = ClassManager.GetClass(self.type.Value);`
	`194`	`+ var basecls = ReflectedClrType.GetOrCreate(self.type.Value);`
`195`	`195`	`return new MethodBinding(self, new PyObject(ob), basecls).Alloc();`
`196`	`196`	`}`
`197`	`197`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ internal sealed class ReflectedClrType : PyType`
`12`	`12`	`{`
`13`	`13`	`private ReflectedClrType(StolenReference reference) : base(reference, prevalidated: true) { }`
`14`	`14`	`internal ReflectedClrType(ReflectedClrType original) : base(original, prevalidated: true) { }`
	`15`	`+ internal ReflectedClrType(BorrowedReference original) : base(original) { }`
`15`	`16`	`ReflectedClrType(SerializationInfo info, StreamingContext context) : base(info, context) { }`
`16`	`17`
`17`	`18`	`internal ClassBase Impl => (ClassBase)ManagedType.GetManagedObject(this)!;`