switched arrayobject.cs to the new style references

lostmsu · lostmsu · commit ff60ec45f6f7 · 2021-10-17T15:45:22.000-07:00
diff --git a/src/runtime/arrayobject.cs b/src/runtime/arrayobject.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -124,14 +125,14 @@ static NewReference NewInstance(Type elementType, BorrowedReference arrayPyType,
                 Exceptions.SetError(Exceptions.MemoryError, oom.Message);
                 return default;
             }
-            return CLRObject.GetInstHandle(result, arrayPyType);
+            return CLRObject.GetReference(result, arrayPyType);
         }
 
 
         /// <summary>
         /// Implements __getitem__ for array types.
         /// </summary>
-        public new static IntPtr mp_subscript(IntPtr ob, IntPtr idx)
+        public new static NewReference mp_subscript(BorrowedReference ob, BorrowedReference idx)
         {
             var obj = (CLRObject)GetManagedObject(ob);
             var arrObj = (ArrayObject)GetManagedObjectType(ob);
@@ -179,7 +180,7 @@ static NewReference NewInstance(Type elementType, BorrowedReference arrayPyType,
                 catch (IndexOutOfRangeException)
                 {
                     Exceptions.SetError(Exceptions.IndexError, "array index out of range");
-                    return IntPtr.Zero;
+                    return default;
                 }
 
                 return Converter.ToPython(value, itemType);
@@ -190,7 +191,7 @@ static NewReference NewInstance(Type elementType, BorrowedReference arrayPyType,
             if (!Runtime.PyTuple_Check(idx))
             {
                 Exceptions.SetError(Exceptions.TypeError, "invalid index value");
-                return IntPtr.Zero;
+                return default;
             }
 
             var count = Runtime.PyTuple_Size(idx);
@@ -199,7 +200,7 @@ static NewReference NewInstance(Type elementType, BorrowedReference arrayPyType,
 
             for (int dimension = 0; dimension < count; dimension++)
             {
-                IntPtr op = Runtime.PyTuple_GetItem(idx, dimension);
+                BorrowedReference op = Runtime.PyTuple_GetItem(idx, dimension);
                 if (!Runtime.PyInt_Check(op))
                 {
                     return RaiseIndexMustBeIntegerError(op);
@@ -226,7 +227,7 @@ static NewReference NewInstance(Type elementType, BorrowedReference arrayPyType,
             catch (IndexOutOfRangeException)
             {
                 Exceptions.SetError(Exceptions.IndexError, "array index out of range");
-                return IntPtr.Zero;
+                return default;
             }
 
             return Converter.ToPython(value, itemType);
@@ -236,14 +237,14 @@ static NewReference NewInstance(Type elementType, BorrowedReference arrayPyType,
         /// <summary>
         /// Implements __setitem__ for array types.
         /// </summary>
-        public static new int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v)
+        public static new int mp_ass_subscript(BorrowedReference ob, BorrowedReference idx, BorrowedReference v)
         {
-            var obj = (CLRObject)GetManagedObject(ob);
-            var items = obj.inst as Array;
+            var obj = (CLRObject)GetManagedObject(ob)!;
+            var items = (Array)obj.inst;
             Type itemType = obj.inst.GetType().GetElementType();
             int rank = items.Rank;
             nint index;
-            object value;
+            object? value;
 
             if (items.IsReadOnly)
             {
@@ -300,7 +301,7 @@ static NewReference NewInstance(Type elementType, BorrowedReference arrayPyType,
 
             for (int dimension = 0; dimension < count; dimension++)
             {
-                IntPtr op = Runtime.PyTuple_GetItem(idx, dimension);
+                BorrowedReference op = Runtime.PyTuple_GetItem(idx, dimension);
                 if (!Runtime.PyInt_Check(op))
                 {
                     RaiseIndexMustBeIntegerError(op);
@@ -335,7 +336,7 @@ static NewReference NewInstance(Type elementType, BorrowedReference arrayPyType,
             return 0;
         }
 
-        private static IntPtr RaiseIndexMustBeIntegerError(IntPtr idx)
+        private static NewReference RaiseIndexMustBeIntegerError(BorrowedReference idx)
         {
             string tpName = Runtime.PyObject_GetTypeName(idx);
             return Exceptions.RaiseTypeError($"array index has type {tpName}, expected an integer");
@@ -344,7 +345,7 @@ private static IntPtr RaiseIndexMustBeIntegerError(IntPtr idx)
         /// <summary>
         /// Implements __contains__ for array types.
         /// </summary>
-        public static int sq_contains(IntPtr ob, IntPtr v)
+        public static int sq_contains(BorrowedReference ob, BorrowedReference v)
         {
             var obj = (CLRObject)GetManagedObject(ob);
             Type itemType = obj.inst.GetType().GetElementType();
@@ -379,7 +380,7 @@ static int GetBuffer(BorrowedReference obj, out Py_buffer buffer, PyBUF flags)
                 Exceptions.SetError(Exceptions.BufferError, "only C-contiguous supported");
                 return -1;
             }
-            var self = (Array)((CLRObject)GetManagedObject(obj)).inst;
+            var self = (Array)((CLRObject)GetManagedObject(obj)!).inst;
             Type itemType = self.GetType().GetElementType();
 
             bool formatRequested = (flags & PyBUF.FORMATS) != 0;
@@ -405,7 +406,7 @@ static int GetBuffer(BorrowedReference obj, out Py_buffer buffer, PyBUF flags)
             buffer = new Py_buffer
             {
                 buf = gcHandle.AddrOfPinnedObject(),
-                obj = Runtime.SelfIncRef(obj.DangerousGetAddress()),
+                obj = new NewReference(obj).DangerousMoveToPointer(),
                 len = (IntPtr)(self.LongLength*itemSize),
                 itemsize = (IntPtr)itemSize,
                 _readonly = false,
@@ -427,6 +428,8 @@ static void ReleaseBuffer(BorrowedReference obj, ref Py_buffer buffer)
             UnmanagedFree(ref buffer.strides);
             UnmanagedFree(ref buffer.suboffsets);
 
+            // TODO: decref buffer.obj?
+
             var gcHandle = (GCHandle)buffer._internal;
             gcHandle.Free();
             buffer._internal = IntPtr.Zero;
diff --git a/src/runtime/classobject.cs b/src/runtime/classobject.cs
@@ -88,7 +88,7 @@ public static IntPtr tp_new(IntPtr tpRaw, IntPtr args, IntPtr kw)
                     return IntPtr.Zero;
                 }
 
-                return CLRObject.GetInstHandle(result, tp).DangerousMoveToPointerOrNull();
+                return CLRObject.GetReference(result, tp).DangerousMoveToPointerOrNull();
             }
 
             if (type.IsAbstract)
@@ -108,7 +108,7 @@ public static IntPtr tp_new(IntPtr tpRaw, IntPtr args, IntPtr kw)
                 return IntPtr.Zero;
             }
 
-            return CLRObject.GetInstHandle(obj, tp).DangerousMoveToPointerOrNull();
+            return CLRObject.GetReference(obj, tp).DangerousMoveToPointerOrNull();
         }
 
         private static NewReference NewEnum(Type type, BorrowedReference args, BorrowedReference tp)
@@ -145,7 +145,7 @@ private static NewReference NewEnum(Type type, BorrowedReference args, BorrowedR
             }
 
             object enumValue = Enum.ToObject(type, result);
-            return CLRObject.GetInstHandle(enumValue, tp);
+            return CLRObject.GetReference(enumValue, tp);
         }
 
 
diff --git a/src/runtime/clrobject.cs b/src/runtime/clrobject.cs
@@ -45,7 +45,7 @@ static CLRObject GetInstance(object ob)
             return GetInstance(ob, cc.tpHandle);
         }
 
-        internal static NewReference GetInstHandle(object ob, BorrowedReference pyType)
+        internal static NewReference GetReference(object ob, BorrowedReference pyType)
         {
             CLRObject co = GetInstance(ob, pyType.DangerousGetAddress());
             return NewReference.DangerousFromPointer(co.pyHandle);
diff --git a/src/runtime/constructorbinding.cs b/src/runtime/constructorbinding.cs
@@ -218,7 +218,7 @@ public static IntPtr tp_call(IntPtr op, IntPtr args, IntPtr kw)
             }
             // Instantiate the python object that wraps the result of the method call
             // and return the PyObject* to it.
-            return CLRObject.GetInstHandle(obj, self.typeToCreate.Reference).DangerousMoveToPointer();
+            return CLRObject.GetReference(obj, self.typeToCreate.Reference).DangerousMoveToPointer();
         }
 
         /// <summary>
diff --git a/src/runtime/managedtype.cs b/src/runtime/managedtype.cs
@@ -128,7 +128,7 @@ internal void FreeGCHandle()
         /// <summary>
         /// Given a Python object, return the associated managed object type or null.
         /// </summary>
-        internal static ManagedType? GetManagedObjectType(IntPtr ob)
+        internal static ManagedType? GetManagedObjectType(BorrowedReference ob)
         {
             if (ob != IntPtr.Zero)
             {

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public static IntPtr tp_new(IntPtr tpRaw, IntPtr args, IntPtr kw)`
`88`	`88`	`return IntPtr.Zero;`
`89`	`89`	`}`
`90`	`90`
`91`		`- return CLRObject.GetInstHandle(result, tp).DangerousMoveToPointerOrNull();`
	`91`	`+ return CLRObject.GetReference(result, tp).DangerousMoveToPointerOrNull();`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`if (type.IsAbstract)`
`@@ -108,7 +108,7 @@ public static IntPtr tp_new(IntPtr tpRaw, IntPtr args, IntPtr kw)`
`108`	`108`	`return IntPtr.Zero;`
`109`	`109`	`}`
`110`	`110`
`111`		`- return CLRObject.GetInstHandle(obj, tp).DangerousMoveToPointerOrNull();`
	`111`	`+ return CLRObject.GetReference(obj, tp).DangerousMoveToPointerOrNull();`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`private static NewReference NewEnum(Type type, BorrowedReference args, BorrowedReference tp)`
`@@ -145,7 +145,7 @@ private static NewReference NewEnum(Type type, BorrowedReference args, BorrowedR`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`object enumValue = Enum.ToObject(type, result);`
`148`		`- return CLRObject.GetInstHandle(enumValue, tp);`
	`148`	`+ return CLRObject.GetReference(enumValue, tp);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ static CLRObject GetInstance(object ob)`
`45`	`45`	`return GetInstance(ob, cc.tpHandle);`
`46`	`46`	`}`
`47`	`47`
`48`		`- internal static NewReference GetInstHandle(object ob, BorrowedReference pyType)`
	`48`	`+ internal static NewReference GetReference(object ob, BorrowedReference pyType)`
`49`	`49`	`{`
`50`	`50`	`CLRObject co = GetInstance(ob, pyType.DangerousGetAddress());`
`51`	`51`	`return NewReference.DangerousFromPointer(co.pyHandle);`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ public static IntPtr tp_call(IntPtr op, IntPtr args, IntPtr kw)`
`218`	`218`	`}`
`219`	`219`	`// Instantiate the python object that wraps the result of the method call`
`220`	`220`	`// and return the PyObject* to it.`
`221`		`- return CLRObject.GetInstHandle(obj, self.typeToCreate.Reference).DangerousMoveToPointer();`
	`221`	`+ return CLRObject.GetReference(obj, self.typeToCreate.Reference).DangerousMoveToPointer();`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ internal void FreeGCHandle()`
`128`	`128`	`/// <summary>`
`129`	`129`	`/// Given a Python object, return the associated managed object type or null.`
`130`	`130`	`/// </summary>`
`131`		`- internal static ManagedType? GetManagedObjectType(IntPtr ob)`
	`131`	`+ internal static ManagedType? GetManagedObjectType(BorrowedReference ob)`
`132`	`132`	`{`
`133`	`133`	`if (ob != IntPtr.Zero)`
`134`	`134`	`{`