workaround for analyzer not permitting copying a reference as the last access to it

lostmsu · lostmsu · commit c4909d43d9d6 · 2021-10-19T10:06:58.000-07:00
diff --git a/src/runtime/NewReference.cs b/src/runtime/NewReference.cs
@@ -145,5 +145,9 @@ public static BorrowedReference Borrow(this in NewReference reference)
         [Pure]
         public static BorrowedReference BorrowOrThrow(this in NewReference reference)
             => reference.IsNull() ? throw PythonException.ThrowLastAsClrException() : reference.BorrowNullable();
+
+        [Obsolete]
+        public static NewReference AnalyzerWorkaround(this in NewReference reference)
+            => NewReference.DangerousFromPointer(reference.DangerousGetAddress());
     }
 }
diff --git a/src/runtime/StolenReference.cs b/src/runtime/StolenReference.cs
@@ -67,5 +67,11 @@ public static IntPtr DangerousGetAddressOrNull(this in StolenReference reference
         [Pure]
         public static IntPtr DangerousGetAddress(this in StolenReference reference)
             => reference.Pointer == IntPtr.Zero ? throw new NullReferenceException() : reference.Pointer;
+
+        public static StolenReference AnalyzerWorkaround(this in StolenReference reference)
+        {
+            IntPtr ptr = reference.DangerousGetAddressOrNull();
+            return StolenReference.TakeNullable(ref ptr);
+        }
     }
 }
diff --git a/src/runtime/classderived.cs b/src/runtime/classderived.cs
@@ -114,7 +114,7 @@ internal static NewReference ToPython(IPythonDerivedType obj)
                 Runtime.PyObject_GC_Track(self.pyHandle);
             }
 
-            return result;
+            return result.AnalyzerWorkaround();
         }
 
         /// <summary>
diff --git a/src/runtime/indexer.cs b/src/runtime/indexer.cs
@@ -113,7 +113,7 @@ internal NewReference GetDefaultArgs(BorrowedReference args)
                 using var arg = Converter.ToPython(pi[i + pynargs].DefaultValue, pi[i + pynargs].ParameterType);
                 Runtime.PyTuple_SetItem(defaultArgs.Borrow(), i, arg.Steal());
             }
-            return defaultArgs;
+            return defaultArgs.AnalyzerWorkaround();
         }
     }
 }
diff --git a/src/runtime/managedtype.cs b/src/runtime/managedtype.cs
@@ -259,14 +259,14 @@ protected static BorrowedReference GetObjectDict(BorrowedReference ob)
         protected static void SetObjectDict(BorrowedReference ob, StolenReference value)
         {
             if (value.Pointer == IntPtr.Zero) throw new ArgumentNullException(nameof(value));
-            SetObjectDictNullable(ob, value);
+            SetObjectDictNullable(ob, value.AnalyzerWorkaround());
         }
         protected static void SetObjectDictNullable(BorrowedReference ob, StolenReference value)
         {
             BorrowedReference type = Runtime.PyObject_TYPE(ob);
             int instanceDictOffset = Util.ReadInt32(type, TypeOffset.tp_dictoffset);
             Debug.Assert(instanceDictOffset > 0);
-            Runtime.ReplaceReference(ob, instanceDictOffset, value);
+            Runtime.ReplaceReference(ob, instanceDictOffset, value.AnalyzerWorkaround());
         }
 
         internal static void GetGCHandle(BorrowedReference reflectedClrObject, BorrowedReference type, out IntPtr handle)
diff --git a/src/runtime/metatype.cs b/src/runtime/metatype.cs
@@ -174,7 +174,7 @@ public static NewReference tp_new(BorrowedReference tp, BorrowedReference args,
 
             Runtime.PyType_Modified(type.Borrow());
 
-            return type;
+            return type.AnalyzerWorkaround();
         }
 
 
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -418,7 +418,7 @@ private static void SetPyMemberTypeOf(out PyObject obj, StolenReference value)
             }
             var @ref = new BorrowedReference(value.Pointer);
             var type = PyObject_Type(@ref);
-            XDecref(value);
+            XDecref(value.AnalyzerWorkaround());
             SetPyMember(out obj, type.StealNullable());
         }
 
@@ -578,7 +578,7 @@ internal static NewReference ExtendTuple(BorrowedReference t, params PyObject[]
                 PyTuple_SetItem(items.Borrow(), size + n, args[n]);
             }
 
-            return items;
+            return items.AnalyzerWorkaround();
         }
 
         internal static Type[]? PythonArgsToTypeArray(BorrowedReference arg)
@@ -688,7 +688,7 @@ internal static unsafe void XDecref(StolenReference op)
 #endif
 #if !CUSTOM_INCDEC_REF
             if (op == null) return;
-            Py_DecRef(op);
+            Py_DecRef(op.AnalyzerWorkaround());
             return;
 #else
             var p = (void*)op;

Original file line number	Diff line number	Diff line change
`@@ -145,5 +145,9 @@ public static BorrowedReference Borrow(this in NewReference reference)`
`145`	`145`	`[Pure]`
`146`	`146`	`public static BorrowedReference BorrowOrThrow(this in NewReference reference)`
`147`	`147`	`=> reference.IsNull() ? throw PythonException.ThrowLastAsClrException() : reference.BorrowNullable();`
	`148`	`+`
	`149`	`+ [Obsolete]`
	`150`	`+ public static NewReference AnalyzerWorkaround(this in NewReference reference)`
	`151`	`+ => NewReference.DangerousFromPointer(reference.DangerousGetAddress());`
`148`	`152`	`}`
`149`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,11 @@ public static IntPtr DangerousGetAddressOrNull(this in StolenReference reference`
`67`	`67`	`[Pure]`
`68`	`68`	`public static IntPtr DangerousGetAddress(this in StolenReference reference)`
`69`	`69`	`=> reference.Pointer == IntPtr.Zero ? throw new NullReferenceException() : reference.Pointer;`
	`70`	`+`
	`71`	`+ public static StolenReference AnalyzerWorkaround(this in StolenReference reference)`
	`72`	`+ {`
	`73`	`+ IntPtr ptr = reference.DangerousGetAddressOrNull();`
	`74`	`+ return StolenReference.TakeNullable(ref ptr);`
	`75`	`+ }`
`70`	`76`	`}`
`71`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ internal static NewReference ToPython(IPythonDerivedType obj)`
`114`	`114`	`Runtime.PyObject_GC_Track(self.pyHandle);`
`115`	`115`	`}`
`116`	`116`
`117`		`- return result;`
	`117`	`+ return result.AnalyzerWorkaround();`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ internal NewReference GetDefaultArgs(BorrowedReference args)`
`113`	`113`	`using var arg = Converter.ToPython(pi[i + pynargs].DefaultValue, pi[i + pynargs].ParameterType);`
`114`	`114`	`Runtime.PyTuple_SetItem(defaultArgs.Borrow(), i, arg.Steal());`
`115`	`115`	`}`
`116`		`- return defaultArgs;`
	`116`	`+ return defaultArgs.AnalyzerWorkaround();`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -259,14 +259,14 @@ protected static BorrowedReference GetObjectDict(BorrowedReference ob)`
`259`	`259`	`protected static void SetObjectDict(BorrowedReference ob, StolenReference value)`
`260`	`260`	`{`
`261`	`261`	`if (value.Pointer == IntPtr.Zero) throw new ArgumentNullException(nameof(value));`
`262`		`- SetObjectDictNullable(ob, value);`
	`262`	`+ SetObjectDictNullable(ob, value.AnalyzerWorkaround());`
`263`	`263`	`}`
`264`	`264`	`protected static void SetObjectDictNullable(BorrowedReference ob, StolenReference value)`
`265`	`265`	`{`
`266`	`266`	`BorrowedReference type = Runtime.PyObject_TYPE(ob);`
`267`	`267`	`int instanceDictOffset = Util.ReadInt32(type, TypeOffset.tp_dictoffset);`
`268`	`268`	`Debug.Assert(instanceDictOffset > 0);`
`269`		`- Runtime.ReplaceReference(ob, instanceDictOffset, value);`
	`269`	`+ Runtime.ReplaceReference(ob, instanceDictOffset, value.AnalyzerWorkaround());`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`internal static void GetGCHandle(BorrowedReference reflectedClrObject, BorrowedReference type, out IntPtr handle)`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public static NewReference tp_new(BorrowedReference tp, BorrowedReference args,`
`174`	`174`
`175`	`175`	`Runtime.PyType_Modified(type.Borrow());`
`176`	`176`
`177`		`- return type;`
	`177`	`+ return type.AnalyzerWorkaround();`
`178`	`178`	`}`
`179`	`179`
`180`	`180`
Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ private static void SetPyMemberTypeOf(out PyObject obj, StolenReference value)`
`418`	`418`	`}`
`419`	`419`	`var @ref = new BorrowedReference(value.Pointer);`
`420`	`420`	`var type = PyObject_Type(@ref);`
`421`		`- XDecref(value);`
	`421`	`+ XDecref(value.AnalyzerWorkaround());`
`422`	`422`	`SetPyMember(out obj, type.StealNullable());`
`423`	`423`	`}`
`424`	`424`
`@@ -578,7 +578,7 @@ internal static NewReference ExtendTuple(BorrowedReference t, params PyObject[]`
`578`	`578`	`PyTuple_SetItem(items.Borrow(), size + n, args[n]);`
`579`	`579`	`}`
`580`	`580`
`581`		`- return items;`
	`581`	`+ return items.AnalyzerWorkaround();`
`582`	`582`	`}`
`583`	`583`
`584`	`584`	`internal static Type[]? PythonArgsToTypeArray(BorrowedReference arg)`
`@@ -688,7 +688,7 @@ internal static unsafe void XDecref(StolenReference op)`
`688`	`688`	`#endif`
`689`	`689`	`#if !CUSTOM_INCDEC_REF`
`690`	`690`	`if (op == null) return;`
`691`		`- Py_DecRef(op);`
	`691`	`+ Py_DecRef(op.AnalyzerWorkaround());`
`692`	`692`	`return;`
`693`	`693`	`#else`
`694`	`694`	`var p = (void*)op;`