Disallow InstParam

dotnet · Feb 10, 2025 · 4b809c8 · 4b809c8
1 parent fe5cc42
commit 4b809c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/src/coreclr/jit/importercalls.cpp b/src/coreclr/jit/importercalls.cpp
@@ -8234,17 +8234,17 @@ void Compiler::impDevirtualizeCall(GenTreeCall*            call,
 
     if (dvInfo.isInstantiatingStub)
     {
-        // We should only end up with generic methods for array interface devirt.
+        // We should only end up with generic methods for array interface or GVM devirt.
         //
         assert(dvInfo.wasArrayInterfaceOrGvmDevirt);
 
         // We don't expect NAOT to end up here, since it has Array<T>
-        // and normal devirtualization.
+        // and normal devirtualization, and it does not (yet) support GVM devirtualization.
         //
         assert(!IsTargetAbi(CORINFO_NATIVEAOT_ABI));
 
         // We don't expect R2R to end up here, since it does not (yet) support
-        // array interface devirtualization.
+        // array interface or GVM devirtualization.
         //
         assert(!opts.IsReadyToRun());
 

diff --git a/src/coreclr/vm/jitinterface.cpp b/src/coreclr/vm/jitinterface.cpp
@@ -8750,7 +8750,7 @@ bool CEEInfo::resolveVirtualMethodHelper(CORINFO_DEVIRTUALIZATION_INFO * info)
 
     if (pDevirtMD->HasMethodInstantiation())
     {
-        pDevirtMD = pDevirtMD->FindOrCreateAssociatedMethodDesc(pDevirtMD, pDevirtMD->GetMethodTable(), false, pBaseMD->GetMethodInstantiation(), true);
+        pDevirtMD = pDevirtMD->FindOrCreateAssociatedMethodDesc(pDevirtMD, pDevirtMD->GetMethodTable(), false, pBaseMD->GetMethodInstantiation(), false);
     }
 
     // Determine the exact class.
@@ -8783,7 +8783,7 @@ bool CEEInfo::resolveVirtualMethodHelper(CORINFO_DEVIRTUALIZATION_INFO * info)
 
     // Success! Pass back the results.
     //
-    if (isArray)
+    if (isArray || pDevirtMD->HasMethodInstantiation())
     {
         // Note if array devirtualization produced an instantiation stub
         // so jit can try and inline it.
@@ -8794,16 +8794,8 @@ bool CEEInfo::resolveVirtualMethodHelper(CORINFO_DEVIRTUALIZATION_INFO * info)
     }
     else
     {
-        if (pDevirtMD->HasMethodInstantiation())
-        {
-            info->exactContext = MAKE_METHODCONTEXT((CORINFO_METHOD_HANDLE) pDevirtMD);
-            info->wasArrayInterfaceOrGvmDevirt = true;
-        }
-        else
-        {
-            info->exactContext = MAKE_CLASSCONTEXT((CORINFO_CLASS_HANDLE) pExactMT);
-            info->wasArrayInterfaceOrGvmDevirt = false;
-        }
+        info->exactContext = MAKE_CLASSCONTEXT((CORINFO_CLASS_HANDLE) pExactMT);
+        info->wasArrayInterfaceOrGvmDevirt = false;
         info->isInstantiatingStub = false;
     }