make PyModule_AddObject in line with CPython

BadSingleton · BadSingleton · commit bd7e7450847d · 2021-06-14T09:57:53.000-04:00
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -122,7 +122,7 @@ static void SetupImportHook()
             Runtime.PyTuple_SetItem(args, 1, mod_dict);
             Runtime.PyObject_Call(exec, args, default);
             // Set as a sub-module of clr.
-            if(Runtime.PyModule_AddObject(ClrModuleReference, "loader", import_hook_module) != 0)
+            if(Runtime.PyModule_AddObject(ClrModuleReference, "loader", import_hook_module.DangerousGetAddress()) != 0)
             {
                 Runtime.XDecref(import_hook_module.DangerousGetAddress());
                 throw PythonException.ThrowLastAsClrException();
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1934,9 +1934,12 @@ internal static string PyModule_GetFilename(IntPtr module)
         /// </summary>
         /// <param name="module">The module to add the object to.</param>
         /// <param name="name">The key that will refer to the object.</param>
-        /// <param name="stolenObject">The object to add to the module.</param>
+        /// <param name="stolenObject">
+        ///     The object to add to the module. The reference will be stolen only if the
+        ///      method returns 0. 
+        /// </param>
         /// <returns>Return -1 on error, 0 on success.</returns>
-        internal static int PyModule_AddObject(BorrowedReference module, string name, BorrowedReference stolenObject)
+        internal static int PyModule_AddObject(BorrowedReference module, string name, IntPtr stolenObject)
         {
             using var namePtr = new StrPtr(name, Encoding.UTF8);
             return Delegates.PyModule_AddObject(module, namePtr, stolenObject);
@@ -2498,7 +2501,7 @@ static Delegates()
                 {
                     PyModule_Create2 = (delegate* unmanaged[Cdecl]<IntPtr, int, IntPtr>)GetFunctionByName("PyModule_Create2TraceRefs", GetUnmanagedDll(_PythonDll));
                 }
-                PyModule_AddObject = (delegate* unmanaged[Cdecl]<BorrowedReference, StrPtr, BorrowedReference, int>)GetFunctionByName(nameof(PyModule_AddObject), GetUnmanagedDll(_PythonDll));
+                PyModule_AddObject = (delegate* unmanaged[Cdecl]<BorrowedReference, StrPtr, IntPtr, int>)GetFunctionByName(nameof(PyModule_AddObject), GetUnmanagedDll(_PythonDll));
                 PyImport_Import = (delegate* unmanaged[Cdecl]<IntPtr, IntPtr>)GetFunctionByName(nameof(PyImport_Import), GetUnmanagedDll(_PythonDll));
                 PyImport_ImportModule = (delegate* unmanaged[Cdecl]<StrPtr, NewReference>)GetFunctionByName(nameof(PyImport_ImportModule), GetUnmanagedDll(_PythonDll));
                 PyImport_ReloadModule = (delegate* unmanaged[Cdecl]<BorrowedReference, NewReference>)GetFunctionByName(nameof(PyImport_ReloadModule), GetUnmanagedDll(_PythonDll));
@@ -2787,7 +2790,7 @@ static Delegates()
             internal static delegate* unmanaged[Cdecl]<BorrowedReference, BorrowedReference> PyModule_GetDict { get; }
             internal static delegate* unmanaged[Cdecl]<IntPtr, StrPtr> PyModule_GetFilename { get; }
             internal static delegate* unmanaged[Cdecl]<IntPtr, int, IntPtr> PyModule_Create2 { get; }
-            internal static delegate* unmanaged[Cdecl]<BorrowedReference, StrPtr, BorrowedReference, int> PyModule_AddObject { get; }
+            internal static delegate* unmanaged[Cdecl]<BorrowedReference, StrPtr, IntPtr, int> PyModule_AddObject { get; }
             internal static delegate* unmanaged[Cdecl]<IntPtr, IntPtr> PyImport_Import { get; }
             internal static delegate* unmanaged[Cdecl]<StrPtr, NewReference> PyImport_ImportModule { get; }
             internal static delegate* unmanaged[Cdecl]<BorrowedReference, NewReference> PyImport_ReloadModule { get; }

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ static void SetupImportHook()`
`122`	`122`	`Runtime.PyTuple_SetItem(args, 1, mod_dict);`
`123`	`123`	`Runtime.PyObject_Call(exec, args, default);`
`124`	`124`	`// Set as a sub-module of clr.`
`125`		`- if(Runtime.PyModule_AddObject(ClrModuleReference, "loader", import_hook_module) != 0)`
	`125`	`+ if(Runtime.PyModule_AddObject(ClrModuleReference, "loader", import_hook_module.DangerousGetAddress()) != 0)`
`126`	`126`	`{`
`127`	`127`	`Runtime.XDecref(import_hook_module.DangerousGetAddress());`
`128`	`128`	`throw PythonException.ThrowLastAsClrException();`