Merge remote-tracking branch 'upstream/master' into domain-reload-test-cases-fixes

BadSingleton · BadSingleton · commit 8639f093563f · 2020-12-18T13:31:59.000-05:00
diff --git a/src/runtime/interop.cs b/src/runtime/interop.cs
@@ -491,6 +491,9 @@ internal static Type GetPrototype(string name)
             return pmap[name] as Type;
         }
 
+
+        internal static Dictionary<IntPtr, Delegate> allocatedThunks = new Dictionary<IntPtr, Delegate>();
+
         internal static ThunkInfo GetThunk(MethodInfo method, string funcType = null)
         {
             Type dt;
@@ -505,6 +508,7 @@ internal static ThunkInfo GetThunk(MethodInfo method, string funcType = null)
             }
             Delegate d = Delegate.CreateDelegate(dt, method);
             var info = new ThunkInfo(d);
+            allocatedThunks[info.Address] = d;
             return info;
         }
 
diff --git a/src/runtime/managedtype.cs b/src/runtime/managedtype.cs
@@ -178,7 +178,7 @@ internal static int PyVisit(IntPtr ob, IntPtr visit, IntPtr arg)
             {
                 return 0;
             }
-            var visitFunc = (Interop.ObjObjFunc)Marshal.GetDelegateForFunctionPointer(visit, typeof(Interop.ObjObjFunc));
+            var visitFunc = NativeCall.GetDelegate<Interop.ObjObjFunc>(visit);
             return visitFunc(ob, arg);
         }
 
@@ -196,7 +196,7 @@ internal void CallTypeClear()
             {
                 return;
             }
-            var clearFunc = (Interop.InquiryFunc)Marshal.GetDelegateForFunctionPointer(clearPtr, typeof(Interop.InquiryFunc));
+            var clearFunc = NativeCall.GetDelegate<Interop.InquiryFunc>(clearPtr);
             clearFunc(pyHandle);
         }
 
@@ -214,7 +214,8 @@ internal void CallTypeTraverse(Interop.ObjObjFunc visitproc, IntPtr arg)
             {
                 return;
             }
-            var traverseFunc = (Interop.ObjObjArgFunc)Marshal.GetDelegateForFunctionPointer(traversePtr, typeof(Interop.ObjObjArgFunc));
+            var traverseFunc = NativeCall.GetDelegate<Interop.ObjObjArgFunc>(traversePtr);
+
             var visiPtr = Marshal.GetFunctionPointerForDelegate(visitproc);
             traverseFunc(pyHandle, visiPtr, arg);
         }
diff --git a/src/runtime/nativecall.cs b/src/runtime/nativecall.cs
@@ -40,10 +40,15 @@ public static int Int_Call_3(IntPtr fp, IntPtr a1, IntPtr a2, IntPtr a3)
             return d(a1, a2, a3);
         }
 
-        private static T GetDelegate<T>(IntPtr fp) where T: Delegate
+        internal static T GetDelegate<T>(IntPtr fp) where T: Delegate
         {
-            // Use Marshal.GetDelegateForFunctionPointer<> directly after upgrade the framework
-            return (T)Marshal.GetDelegateForFunctionPointer(fp, typeof(T));
+            Delegate d = null;
+            if (!Interop.allocatedThunks.TryGetValue(fp, out d))
+            {
+                // We don't cache this delegate because this is a pure delegate ot unmanaged.
+                d = Marshal.GetDelegateForFunctionPointer<T>(fp);
+            }
+            return (T)d;
         }
     }
 }
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1025,16 +1025,13 @@ internal static bool PyObject_IsIterable(IntPtr pointer)
         }
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int PyObject_HasAttrString(IntPtr pointer, string name);
+        internal static extern int PyObject_HasAttrString(IntPtr pointer, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Utf8Marshaler))] string name);
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern IntPtr PyObject_GetAttrString(IntPtr pointer, string name);
+        internal static extern IntPtr PyObject_GetAttrString(IntPtr pointer, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Utf8Marshaler))] string name);
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern IntPtr PyObject_GetAttrString(IntPtr pointer, IntPtr name);
-
-        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int PyObject_SetAttrString(IntPtr pointer, string name, IntPtr value);
+        internal static extern int PyObject_SetAttrString(IntPtr pointer, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Utf8Marshaler))] string name, IntPtr value);
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern int PyObject_HasAttr(IntPtr pointer, IntPtr name);
@@ -1649,7 +1646,7 @@ internal static bool PyDict_Check(IntPtr ob)
         /// Return value: Borrowed reference.
         /// </summary>
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern IntPtr PyDict_GetItemString(IntPtr pointer, string key);
+        internal static extern IntPtr PyDict_GetItemString(IntPtr pointer, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Utf8Marshaler))] string key);
 
         /// <summary>
         /// Return 0 on success or -1 on failure.
@@ -1661,13 +1658,13 @@ internal static bool PyDict_Check(IntPtr ob)
         ///  Return 0 on success or -1 on failure.
         /// </summary>
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int PyDict_SetItemString(IntPtr pointer, string key, IntPtr value);
+        internal static extern int PyDict_SetItemString(IntPtr pointer, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Utf8Marshaler))] string key, IntPtr value);
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern int PyDict_DelItem(IntPtr pointer, IntPtr key);
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int PyDict_DelItemString(IntPtr pointer, string key);
+        internal static extern int PyDict_DelItemString(IntPtr pointer, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Utf8Marshaler))] string key);
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern int PyMapping_HasKey(IntPtr pointer, IntPtr key);
@@ -2019,7 +2016,7 @@ internal static IntPtr PyMem_Realloc(IntPtr ptr, long size)
         //====================================================================
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern void PyErr_SetString(IntPtr ob, string message);
+        internal static extern void PyErr_SetString(IntPtr ob, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Utf8Marshaler))] string message);
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern void PyErr_SetObject(BorrowedReference type, BorrowedReference exceptionObject);
diff --git a/src/testing/methodtest.cs b/src/testing/methodtest.cs
@@ -713,6 +713,10 @@ public static string ParamsArrayOverloaded(int i, params int[] paramsArray)
         {
             return "with params-array";
         }
+
+        public static void EncodingTestÅngström()
+        {
+        }
     }
 
 
diff --git a/src/tests/test_method.py b/src/tests/test_method.py
@@ -1221,3 +1221,5 @@ def test_params_array_overload():
     # res = MethodTest.ParamsArrayOverloaded(paramsArray=[], i=1)
     # assert res == "with params-array"
 
+def test_method_encoding():
+    MethodTest.EncodingTestÅngström()

Original file line number	Diff line number	Diff line change
`@@ -491,6 +491,9 @@ internal static Type GetPrototype(string name)`
`491`	`491`	`return pmap[name] as Type;`
`492`	`492`	`}`
`493`	`493`
	`494`	`+`
	`495`	`+ internal static Dictionary<IntPtr, Delegate> allocatedThunks = new Dictionary<IntPtr, Delegate>();`
	`496`	`+`
`494`	`497`	`internal static ThunkInfo GetThunk(MethodInfo method, string funcType = null)`
`495`	`498`	`{`
`496`	`499`	`Type dt;`
`@@ -505,6 +508,7 @@ internal static ThunkInfo GetThunk(MethodInfo method, string funcType = null)`
`505`	`508`	`}`
`506`	`509`	`Delegate d = Delegate.CreateDelegate(dt, method);`
`507`	`510`	`var info = new ThunkInfo(d);`
	`511`	`+ allocatedThunks[info.Address] = d;`
`508`	`512`	`return info;`
`509`	`513`	`}`
`510`	`514`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ internal static int PyVisit(IntPtr ob, IntPtr visit, IntPtr arg)`
`178`	`178`	`{`
`179`	`179`	`return 0;`
`180`	`180`	`}`
`181`		`- var visitFunc = (Interop.ObjObjFunc)Marshal.GetDelegateForFunctionPointer(visit, typeof(Interop.ObjObjFunc));`
	`181`	`+ var visitFunc = NativeCall.GetDelegate<Interop.ObjObjFunc>(visit);`
`182`	`182`	`return visitFunc(ob, arg);`
`183`	`183`	`}`
`184`	`184`
`@@ -196,7 +196,7 @@ internal void CallTypeClear()`
`196`	`196`	`{`
`197`	`197`	`return;`
`198`	`198`	`}`
`199`		`- var clearFunc = (Interop.InquiryFunc)Marshal.GetDelegateForFunctionPointer(clearPtr, typeof(Interop.InquiryFunc));`
	`199`	`+ var clearFunc = NativeCall.GetDelegate<Interop.InquiryFunc>(clearPtr);`
`200`	`200`	`clearFunc(pyHandle);`
`201`	`201`	`}`
`202`	`202`
`@@ -214,7 +214,8 @@ internal void CallTypeTraverse(Interop.ObjObjFunc visitproc, IntPtr arg)`
`214`	`214`	`{`
`215`	`215`	`return;`
`216`	`216`	`}`
`217`		`- var traverseFunc = (Interop.ObjObjArgFunc)Marshal.GetDelegateForFunctionPointer(traversePtr, typeof(Interop.ObjObjArgFunc));`
	`217`	`+ var traverseFunc = NativeCall.GetDelegate<Interop.ObjObjArgFunc>(traversePtr);`
	`218`	`+`
`218`	`219`	`var visiPtr = Marshal.GetFunctionPointerForDelegate(visitproc);`
`219`	`220`	`traverseFunc(pyHandle, visiPtr, arg);`
`220`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,15 @@ public static int Int_Call_3(IntPtr fp, IntPtr a1, IntPtr a2, IntPtr a3)`
`40`	`40`	`return d(a1, a2, a3);`
`41`	`41`	`}`
`42`	`42`
`43`		`- private static T GetDelegate<T>(IntPtr fp) where T: Delegate`
	`43`	`+ internal static T GetDelegate<T>(IntPtr fp) where T: Delegate`
`44`	`44`	`{`
`45`		`- // Use Marshal.GetDelegateForFunctionPointer<> directly after upgrade the framework`
`46`		`- return (T)Marshal.GetDelegateForFunctionPointer(fp, typeof(T));`
	`45`	`+ Delegate d = null;`
	`46`	`+ if (!Interop.allocatedThunks.TryGetValue(fp, out d))`
	`47`	`+ {`
	`48`	`+ // We don't cache this delegate because this is a pure delegate ot unmanaged.`
	`49`	`+ d = Marshal.GetDelegateForFunctionPointer<T>(fp);`
	`50`	`+ }`
	`51`	`+ return (T)d;`
`47`	`52`	`}`
`48`	`53`	`}`
`49`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -713,6 +713,10 @@ public static string ParamsArrayOverloaded(int i, params int[] paramsArray)`
`713`	`713`	`{`
`714`	`714`	`return "with params-array";`
`715`	`715`	`}`
	`716`	`+`
	`717`	`+ public static void EncodingTestÅngström()`
	`718`	`+ {`
	`719`	`+ }`
`716`	`720`	`}`
`717`	`721`
`718`	`722`