improved GetThunk reliability

lostmsu · lostmsu · commit 6335d97d5d4d · 2021-10-19T17:15:34.000-07:00
diff --git a/src/runtime/interop.cs b/src/runtime/interop.cs
@@ -157,18 +157,9 @@ internal static Type GetPrototype(MethodInfo method)
 
         internal static Dictionary<IntPtr, Delegate> allocatedThunks = new Dictionary<IntPtr, Delegate>();
 
-        internal static ThunkInfo GetThunk(MethodInfo method, string funcType = null)
+        internal static ThunkInfo GetThunk(MethodInfo method)
         {
-            Type dt;
-            if (funcType != null)
-                dt = typeof(Interop).GetNestedType(funcType) as Type;
-            else
-                dt = GetPrototype(method);
-
-            if (dt == null)
-            {
-                return ThunkInfo.Empty;
-            }
+            Type dt = GetPrototype(method);
             Delegate d = Delegate.CreateDelegate(dt, method);
             return GetThunk(d);
         }
@@ -192,6 +183,9 @@ internal static ThunkInfo GetThunk(Delegate @delegate)
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         public delegate int B_I32(BorrowedReference ob);
 
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate int BB_I32(BorrowedReference ob, BorrowedReference a);
+
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         public delegate int BBB_I32(BorrowedReference ob, BorrowedReference a1, BorrowedReference a2);
 
diff --git a/src/runtime/metatype.cs b/src/runtime/metatype.cs
@@ -56,7 +56,7 @@ internal static PyType RestoreRuntimeData(MetatypeState storage)
             foreach (var methodName in CustomMethods)
             {
                 var mi = typeof(MetaType).GetMethod(methodName);
-                ThunkInfo thunkInfo = Interop.GetThunk(mi, "BinaryFunc");
+                ThunkInfo thunkInfo = Interop.GetThunk(mi);
                 _metaSlotsHodler.KeeapAlive(thunkInfo);
                 mdef = TypeManager.WriteMethodDef(mdef, methodName, thunkInfo.Address);
             }
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -652,7 +652,7 @@ internal static SlotsHolder SetupMetaSlots(Type impl, PyType type)
         private static IntPtr AddCustomMetaMethod(string name, PyType type, IntPtr mdef, SlotsHolder slotsHolder)
         {
             MethodInfo mi = typeof(MetaType).GetMethod(name);
-            ThunkInfo thunkInfo = Interop.GetThunk(mi, "BinaryFunc");
+            ThunkInfo thunkInfo = Interop.GetThunk(mi);
             slotsHolder.KeeapAlive(thunkInfo);
 
             // XXX: Hard code with mode check.

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ internal static PyType RestoreRuntimeData(MetatypeState storage)`
`56`	`56`	`foreach (var methodName in CustomMethods)`
`57`	`57`	`{`
`58`	`58`	`var mi = typeof(MetaType).GetMethod(methodName);`
`59`		`- ThunkInfo thunkInfo = Interop.GetThunk(mi, "BinaryFunc");`
	`59`	`+ ThunkInfo thunkInfo = Interop.GetThunk(mi);`
`60`	`60`	`_metaSlotsHodler.KeeapAlive(thunkInfo);`
`61`	`61`	`mdef = TypeManager.WriteMethodDef(mdef, methodName, thunkInfo.Address);`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,7 @@ internal static SlotsHolder SetupMetaSlots(Type impl, PyType type)`
`652`	`652`	`private static IntPtr AddCustomMetaMethod(string name, PyType type, IntPtr mdef, SlotsHolder slotsHolder)`
`653`	`653`	`{`
`654`	`654`	`MethodInfo mi = typeof(MetaType).GetMethod(name);`
`655`		`- ThunkInfo thunkInfo = Interop.GetThunk(mi, "BinaryFunc");`
	`655`	`+ ThunkInfo thunkInfo = Interop.GetThunk(mi);`
`656`	`656`	`slotsHolder.KeeapAlive(thunkInfo);`
`657`	`657`
`658`	`658`	`// XXX: Hard code with mode check.`