Handle static methods and also move fcall handling

dotnet · jakobbotsch · Jun 17, 2022 · Apr 12, 2022 · Apr 12, 2022 · Apr 13, 2022
commit 2cbe83f5c094931bbf5f7cc911cd65cdf81cd2ab
diff --git a/src/coreclr/vm/jithelpers.cpp b/src/coreclr/vm/jithelpers.cpp
@@ -5498,10 +5498,18 @@ HCIMPL4(void, JIT_MethodProfile32, Object *obj, CORINFO_METHOD_HANDLE baseMethod
         // without the use of reflection.
         //
         DELEGATEREF del = (DELEGATEREF)objRef;
-        if (del->GetInvocationCount() == 0 && del->GetMethodPtrAux() == NULL)
+        if (del->GetInvocationCount() == 0)
         {
-            PCODE code = del->GetMethodPtr();
-            pMD = NonVirtualEntry2MethodDesc(code);
+            PCODE code = del->GetMethodPtrAux();
+            if (code != NULL)
+            {
+                pMD = MethodTable::GetMethodDescForSlotAddress(code);
+            }
+            else
+            {
+                code = del->GetMethodPtr();
+                pMD = NonVirtualEntry2MethodDesc(code);
+            }
         }
 
         if (pMD == NULL)
@@ -5638,10 +5646,18 @@ HCIMPL4(void, JIT_MethodProfile64, Object *obj, CORINFO_METHOD_HANDLE baseMethod
         // without the use of reflection.
         //
         DELEGATEREF del = (DELEGATEREF)objRef;
-        if (del->GetInvocationCount() == 0 && del->GetMethodPtrAux() == NULL)
+        if (del->GetInvocationCount() == 0)
         {
-            PCODE code = del->GetMethodPtr();
-            pMD = NonVirtualEntry2MethodDesc(code);
+            PCODE code = del->GetMethodPtrAux();
+            if (code != NULL)
+            {
+                pMD = MethodTable::GetMethodDescForSlotAddress(code);
+            }
+            else
+            {
+                code = del->GetMethodPtr();
+                pMD = NonVirtualEntry2MethodDesc(code);
+            }
         }
 
         if (pMD == NULL)

diff --git a/src/coreclr/vm/method.cpp b/src/coreclr/vm/method.cpp
@@ -2137,6 +2137,13 @@ MethodDesc* NonVirtualEntry2MethodDesc(PCODE entryPoint)
             return (MethodDesc*)((FixupPrecode*)pInstr)->GetMethodDesc();
         }
 
+        // Is it an FCALL?
+        MethodDesc* pFCallMD = ECall::MapTargetBackToMethod(entryPoint);
+        if (pFCallMD != NULL)
+        {
+            return pFCallMD;
+        }
+
         return NULL;
     }
 
@@ -2173,11 +2180,6 @@ MethodDesc* Entry2MethodDesc(PCODE entryPoint, MethodTable *pMT)
     if (pMD != NULL)
         RETURN(pMD);
 
-    // Is it an FCALL?
-    pMD = ECall::MapTargetBackToMethod(entryPoint);
-    if (pMD != NULL)
-        RETURN(pMD);
-
     // We should never get here
     _ASSERTE(!"Entry2MethodDesc failed");
     RETURN (NULL);