Compare references correctly to avoid AOT error. Fix Tencent#400

UlyssesWu · Jul 20, 2023 · d436af9 · d436af9
1 parent 552da36
commit d436af9
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/Source/VSProj/Src/Tools/CodeTranslator.cs b/Source/VSProj/Src/Tools/CodeTranslator.cs
@@ -266,6 +266,17 @@ int addInternString(string str, MethodDefinition caller)
             return id;
         }
 
+        private static bool IsMemberReferenceEqual(MemberReference t1, MemberReference t2)
+        {
+            return t1.FullName == t2.FullName &&
+                   t1.Module.Assembly.FullName == t2.Module.Assembly.FullName;
+        }
+
+        private static bool IsAsyncMethodBuilderMethodEqual(GenericInstanceMethod m1, GenericInstanceMethod m2)
+        {
+            return IsMemberReferenceEqual(m1.GenericArguments[0], m2.GenericArguments[0]) && m1.DeclaringType?.FullName == m2.DeclaringType?.FullName;
+        }
+
         //原生方法的引用
         int addExternMethod(MethodReference callee, MethodDefinition caller)
         {
@@ -276,8 +287,7 @@ int addExternMethod(MethodReference callee, MethodDefinition caller)
 
             if (callee.Name == "AwaitUnsafeOnCompleted")
             {
-
-                if (!awaitUnsafeOnCompletedMethods.Any(m => ((GenericInstanceMethod)callee).GenericArguments[0] == ((GenericInstanceMethod)m).GenericArguments[0]))
+                if (awaitUnsafeOnCompletedMethods.All(m => !IsAsyncMethodBuilderMethodEqual((GenericInstanceMethod)callee, (GenericInstanceMethod)m)))
                 {
                     awaitUnsafeOnCompletedMethods.Add(callee);
                 }