Merge pull request dotnet#146 from janvorli/fix-crossgen2-devirt

Fix devirtualization in crossgen2
liyoung1991 · Nov 21, 2019 · 5e5a0d4 · 5e5a0d4
2 parents 028c433 + e70db4c
commit 5e5a0d4
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/coreclr/src/tools/crossgen2/Common/Compiler/DevirtualizationManager.cs b/src/coreclr/src/tools/crossgen2/Common/Compiler/DevirtualizationManager.cs
@@ -82,6 +82,17 @@ protected virtual MethodDesc ResolveVirtualMethod(MethodDesc declMethod, DefType
             else
             {
                 impl = implType.FindVirtualFunctionTargetMethodOnObjectType(declMethod);
+                if (impl != null && (impl != declMethod))
+                {
+                    MethodDesc slotDefiningMethodImpl = MetadataVirtualMethodAlgorithm.FindSlotDefiningMethodForVirtualMethod(impl);
+                    MethodDesc slotDefiningMethodDecl = MetadataVirtualMethodAlgorithm.FindSlotDefiningMethodForVirtualMethod(declMethod);
+
+                    if (slotDefiningMethodImpl != slotDefiningMethodDecl)
+                    {
+                        // We cannot resolve virtual method in case the impl is a different slot from the declMethod
+                        impl = null;
+                    }
+                }
             }
 
             return impl;