Non virtual calls to instance methods non-virtual dispatch on instance interface methods (#27756) (#27868)

* est for non_virtual_calls_to_instance_methods
* Fix handling of callvirt to instance methods on interface types that are not virtual
- Use call type to indicate if its non-virtual or not, instead of opcode
* Use ilproj to protect against future C# compiler changes
- This test needs to test the use of specific opcodes, and so an IL proj is required

Author: davidwrighton

src/vm/jitinterface.cpp

@@ -5772,7 +5772,7 @@ void CEEInfo::getCallInfo(
 
     pResult->methodFlags = getMethodAttribsInternal(pResult->hMethod);
 
-    SignatureKind signatureKind = flags & CORINFO_CALLINFO_CALLVIRT ? SK_VIRTUAL_CALLSITE : SK_CALLSITE;
+    SignatureKind signatureKind = flags & CORINFO_CALLINFO_CALLVIRT && !(pResult->kind == CORINFO_CALL) ? SK_VIRTUAL_CALLSITE : SK_CALLSITE;
     getMethodSigInternal(pResult->hMethod, &pResult->sig, (pResult->hMethod == pResolvedToken->hMethod) ? pResolvedToken->hClass : NULL, signatureKind);
 
     if (flags & CORINFO_CALLINFO_VERIFICATION)

tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/non_virtual_calls_to_instance_methods.cs

@@ -0,0 +1,106 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Sample
+{
+    public sealed class C1 : I1<string>, I2
+    {
+    }
+
+    class Program
+    {
+        static int Main(string[] args)
+        {
+            CallOpcodeNonGenericInterface();
+            CallOpcodeNonGenericInterfaceGenericMethod();
+            CallOpcodeGenericInterface();
+            CallOpcodeGenericInterfaceGenericMethod();
+            CallVirtOpcodeNonGenericInterface();
+            CallVirtOpcodeNonGenericInterfaceGenericMethod();
+            CallVirtOpcodeGenericInterface();
+            CallVirtOpcodeGenericInterfaceGenericMethod();
+
+            return 100;
+        }
+
+        private static void CallOpcodeNonGenericInterface()
+        {
+            Console.WriteLine("Testing call opcode for calling DIM on non-generic interface non-generic method");
+            if (((I2)new C1()).GetItemTypeNonGeneric(typeof(string)) != typeof(string))
+                throw new Exception("CallOpcodeGenericInterface failed");
+        }
+
+        private static void CallOpcodeNonGenericInterfaceGenericMethod()
+        {
+            Console.WriteLine("Testing call opcode for calling DIM on non-generic interface non-generic method");
+            if (((I2)new C1()).GetItemTypeGeneric<object>() != typeof(object))
+                throw new Exception("CallOpcodeGenericInterface failed");
+        }
+
+        private static void CallOpcodeGenericInterface()
+        {
+            Console.WriteLine("Testing call opcode for calling DIM on generic interface");
+            if (((I1<string>)new C1()).GetItemType() != typeof(string))
+                throw new Exception("CallOpcodeGenericInterface failed");
+        }
+
+        private static void CallOpcodeGenericInterfaceGenericMethod()
+        {
+            Console.WriteLine("Testing call opcode for calling generic method on DIM on generic interface");
+            if (((I1<string>)new C1()).GetItemTypeMethod<object>() != typeof(object))
+                throw new Exception("CallOpcodeGenericInterface failed");
+        }
+
+        private static void CallVirtOpcodeNonGenericInterface()
+        {
+            Console.WriteLine("Testing callvirt opcode for calling DIM on non-generic interface non-generic method");
+            I2 c1 = new C1();
+            if (c1.GetItemTypeNonGeneric(typeof(string)) != typeof(string))
+                throw new Exception("CallOpcodeGenericInterface failed");
+        }
+
+        private static void CallVirtOpcodeNonGenericInterfaceGenericMethod()
+        {
+            Console.WriteLine("Testing callvirt opcode for calling DIM on non-generic interface non-generic method");
+            I2 c1 = new C1();
+            if (c1.GetItemTypeGeneric<object>() != typeof(object))
+                throw new Exception("CallOpcodeGenericInterface failed");
+        }
+
+        private static void CallVirtOpcodeGenericInterface()
+        {
+            Console.WriteLine("Testing callvirt opcode for calling DIM on generic interface");
+            I1<string> c1 = new C1();
+            if (c1.GetItemType() != typeof(string))
+                throw new Exception("CallVirtOpcodeGenericInterface failed");
+        }
+
+        private static void CallVirtOpcodeGenericInterfaceGenericMethod()
+        {
+            Console.WriteLine("Testing callvirt opcode for calling generic method on DIM on generic interface");
+            I1<string> c1 = new C1();
+            if (c1.GetItemTypeMethod<object>() != typeof(object))
+                throw new Exception("CallVirtOpcodeGenericInterfaceGenericMethod failed");
+        }
+    }
+}
+
+public interface I1<T>
+{
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    sealed Type GetItemType() => typeof(T);
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    sealed Type GetItemTypeMethod<U>() => typeof(U);
+}
+
+public interface I2
+{
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    sealed Type GetItemTypeNonGeneric(Type t) => t;
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    sealed Type GetItemTypeGeneric<U>() => typeof(U);
+}