Adds an unchecked version to get a BorrowedReference pointer

BadSingleton · BadSingleton · commit 6a3cfc8c7f6f · 2020-09-15T14:31:41.000-04:00
And other code review changes
diff --git a/src/runtime/BorrowedReference.cs b/src/runtime/BorrowedReference.cs
@@ -11,7 +11,14 @@ readonly ref struct BorrowedReference
         public bool IsNull => this.pointer == IntPtr.Zero;
 
         /// <summary>Gets a raw pointer to the Python object</summary>
-        public IntPtr DangerousGetAddress() => this.pointer;
+        public IntPtr DangerousGetAddress()
+            => this.IsNull ? throw new NullReferenceException() : this.pointer;
+
+        /// <summary>
+        /// Gets a raw pointer to the Python object. Does not throw an exception
+        ///  if the pointer is null
+        /// </summary>
+        public IntPtr DangerousGetAddressUnchecked() => this.pointer;
 
         /// <summary>
         /// Creates new instance of <see cref="BorrowedReference"/> from raw pointer. Unsafe.
diff --git a/src/runtime/runtime_data.cs b/src/runtime/runtime_data.cs
@@ -70,7 +70,7 @@ internal static void Stash()
             Marshal.WriteIntPtr(mem, (IntPtr)ms.Length);
             Marshal.Copy(data, 0, mem + IntPtr.Size, (int)ms.Length);
 
-            IntPtr capsule = PySys_GetObject("clr_data").DangerousGetAddress();
+            IntPtr capsule = PySys_GetObject("clr_data").DangerousGetAddressUnchecked();
             if (capsule != IntPtr.Zero)
             {
                 IntPtr oldData = PyCapsule_GetPointer(capsule, null);
@@ -96,7 +96,7 @@ internal static void RestoreRuntimeData()
 
         private static void RestoreRuntimeDataImpl()
         {
-            IntPtr capsule = PySys_GetObject("clr_data").DangerousGetAddress();
+            IntPtr capsule = PySys_GetObject("clr_data").DangerousGetAddressUnchecked();
             if (capsule == IntPtr.Zero)
             {
                 return;
diff --git a/tools/geninterop/geninterop.py b/tools/geninterop/geninterop.py
@@ -21,10 +21,7 @@
 import sysconfig
 import subprocess
 
-if sys.version_info.major > 2:
-    from io import StringIO
-else:
-    from StringIO import StringIO
+from StringIO import StringIO
 
 from pycparser import c_ast, c_parser
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ internal static void Stash()`
`70`	`70`	`Marshal.WriteIntPtr(mem, (IntPtr)ms.Length);`
`71`	`71`	`Marshal.Copy(data, 0, mem + IntPtr.Size, (int)ms.Length);`
`72`	`72`
`73`		`- IntPtr capsule = PySys_GetObject("clr_data").DangerousGetAddress();`
	`73`	`+ IntPtr capsule = PySys_GetObject("clr_data").DangerousGetAddressUnchecked();`
`74`	`74`	`if (capsule != IntPtr.Zero)`
`75`	`75`	`{`
`76`	`76`	`IntPtr oldData = PyCapsule_GetPointer(capsule, null);`
`@@ -96,7 +96,7 @@ internal static void RestoreRuntimeData()`
`96`	`96`
`97`	`97`	`private static void RestoreRuntimeDataImpl()`
`98`	`98`	`{`
`99`		`- IntPtr capsule = PySys_GetObject("clr_data").DangerousGetAddress();`
	`99`	`+ IntPtr capsule = PySys_GetObject("clr_data").DangerousGetAddressUnchecked();`
`100`	`100`	`if (capsule == IntPtr.Zero)`
`101`	`101`	`{`
`102`	`102`	`return;`