separate .Steal() and .StealNullable()

lostmsu · lostmsu · commit 343320139f41 · 2021-04-10T17:34:30.000-07:00
diff --git a/src/runtime/NewReference.cs b/src/runtime/NewReference.cs
@@ -2,6 +2,7 @@ namespace Python.Runtime
 {
     using System;
     using System.Diagnostics.Contracts;
+    using System.Runtime.CompilerServices;
 
     /// <summary>
     /// Represents a reference to a Python object, that is tracked by Python's reference counting.
@@ -65,12 +66,25 @@ public IntPtr DangerousMoveToPointerOrNull()
         /// Call this method to move ownership of this reference to a Python C API function,
         /// that steals reference passed to it.
         /// </summary>
-        public StolenReference Steal()
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public StolenReference StealNullable()
         {
             IntPtr rawPointer = this.pointer;
             this.pointer = IntPtr.Zero;
             return new StolenReference(rawPointer);
         }
+
+        /// <summary>
+        /// Call this method to move ownership of this reference to a Python C API function,
+        /// that steals reference passed to it.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public StolenReference Steal()
+        {
+            if (this.IsNull()) throw new NullReferenceException();
+
+            return this.StealNullable();
+        }
         /// <summary>
         /// Removes this reference to a Python object, and sets it to <c>null</c>.
         /// </summary>
diff --git a/src/runtime/finalizer.cs b/src/runtime/finalizer.cs
@@ -160,7 +160,7 @@ private void DisposeAll()
                 {
                     // Python requires finalizers to preserve exception:
                     // https://docs.python.org/3/extending/newtypes.html#finalization-and-de-allocation
-                    Runtime.PyErr_Restore(errType.Steal(), errVal.Steal(), traceback.Steal());
+                    Runtime.PyErr_Restore(errType.StealNullable(), errVal.StealNullable(), traceback.StealNullable());
                 }
             }
         }
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -218,7 +218,7 @@ protected virtual void Dispose(bool disposing)
                     {
                         // Python requires finalizers to preserve exception:
                         // https://docs.python.org/3/extending/newtypes.html#finalization-and-de-allocation
-                        Runtime.PyErr_Restore(errType.Steal(), errVal.Steal(), traceback.Steal());
+                        Runtime.PyErr_Restore(errType.StealNullable(), errVal.StealNullable(), traceback.StealNullable());
                     }
                 }
                 else
diff --git a/src/runtime/pythonexception.cs b/src/runtime/pythonexception.cs
@@ -239,9 +239,9 @@ public void Restore()
         {
             IntPtr gs = PythonEngine.AcquireLock();
             Runtime.PyErr_Restore(
-                Type.NewReferenceOrNull().Steal(),
-                Value.NewReferenceOrNull().Steal(),
-                Traceback.NewReferenceOrNull().Steal());
+                Type.NewReferenceOrNull().StealNullable(),
+                Value.NewReferenceOrNull().StealNullable(),
+                Traceback.NewReferenceOrNull().StealNullable());
             PythonEngine.ReleaseLock(gs);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ private void DisposeAll()`
`160`	`160`	`{`
`161`	`161`	`// Python requires finalizers to preserve exception:`
`162`	`162`	`// https://docs.python.org/3/extending/newtypes.html#finalization-and-de-allocation`
`163`		`- Runtime.PyErr_Restore(errType.Steal(), errVal.Steal(), traceback.Steal());`
	`163`	`+ Runtime.PyErr_Restore(errType.StealNullable(), errVal.StealNullable(), traceback.StealNullable());`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ protected virtual void Dispose(bool disposing)`
`218`	`218`	`{`
`219`	`219`	`// Python requires finalizers to preserve exception:`
`220`	`220`	`// https://docs.python.org/3/extending/newtypes.html#finalization-and-de-allocation`
`221`		`- Runtime.PyErr_Restore(errType.Steal(), errVal.Steal(), traceback.Steal());`
	`221`	`+ Runtime.PyErr_Restore(errType.StealNullable(), errVal.StealNullable(), traceback.StealNullable());`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`	`else`
Original file line number	Diff line number	Diff line change
`@@ -239,9 +239,9 @@ public void Restore()`
`239`	`239`	`{`
`240`	`240`	`IntPtr gs = PythonEngine.AcquireLock();`
`241`	`241`	`Runtime.PyErr_Restore(`
`242`		`- Type.NewReferenceOrNull().Steal(),`
`243`		`- Value.NewReferenceOrNull().Steal(),`
`244`		`- Traceback.NewReferenceOrNull().Steal());`
	`242`	`+ Type.NewReferenceOrNull().StealNullable(),`
	`243`	`+ Value.NewReferenceOrNull().StealNullable(),`
	`244`	`+ Traceback.NewReferenceOrNull().StealNullable());`
`245`	`245`	`PythonEngine.ReleaseLock(gs);`
`246`	`246`	`}`
`247`	`247`