Implementation of ldftn and calli

src/coreclr/inc/CrstTypes.def

@@ -527,4 +527,8 @@ Crst PerfMap
 End
 
 Crst InterfaceDispatchGlobalLists
+End
+
+Crst CallStubCache
+    AcquiredBefore LoaderHeap
 End

src/coreclr/inc/corinfo.h

@@ -3189,8 +3189,7 @@ class ICorDynamicInfo : public ICorStaticInfo
             CORINFO_CONST_LOOKUP *  pLookup
             ) = 0;
 
-    // Generate a cookie based on the signature that would needs to be passed
-    // to CORINFO_HELP_PINVOKE_CALLI
+    // Generate a cookie based on the signature to pass to CORINFO_HELP_PINVOKE_CALLI
     virtual void* GetCookieForPInvokeCalliSig(
             CORINFO_SIG_INFO*   szMetaSig,
             void**              ppIndirection = NULL
@@ -3202,6 +3201,10 @@ class ICorDynamicInfo : public ICorStaticInfo
             CORINFO_SIG_INFO*   szMetaSig
             ) = 0;
 
+    // Generate a cookie based on the signature to pass to INTOP_CALLI in the interpreter.
+    virtual void* GetCookieForInterpreterCalliSig(
+            CORINFO_SIG_INFO*   szMetaSig) = 0;
+
     // Gets a handle that is checked to see if the current method is
     // included in "JustMyCode"
     virtual CORINFO_JUST_MY_CODE_HANDLE getJustMyCodeHandle(

src/coreclr/inc/crsttypes_generated.h

@@ -20,105 +20,106 @@ enum CrstType
     CrstAssemblyLoader = 2,
     CrstAvailableClass = 3,
     CrstAvailableParamTypes = 4,
-    CrstCCompRC = 5,
-    CrstClassFactInfoHash = 6,
-    CrstClassInit = 7,
-    CrstClrNotification = 8,
-    CrstCodeFragmentHeap = 9,
-    CrstCodeVersioning = 10,
-    CrstCOMCallWrapper = 11,
-    CrstCOMWrapperCache = 12,
-    CrstDataTest1 = 13,
-    CrstDataTest2 = 14,
-    CrstDbgTransport = 15,
-    CrstDeadlockDetection = 16,
-    CrstDebuggerController = 17,
-    CrstDebuggerFavorLock = 18,
-    CrstDebuggerHeapExecMemLock = 19,
-    CrstDebuggerHeapLock = 20,
-    CrstDebuggerJitInfo = 21,
-    CrstDebuggerMutex = 22,
-    CrstDynamicIL = 23,
-    CrstDynamicMT = 24,
-    CrstEtwTypeLogHash = 25,
-    CrstEventPipe = 26,
-    CrstEventStore = 27,
-    CrstException = 28,
-    CrstExecutableAllocatorLock = 29,
-    CrstFCall = 30,
-    CrstFrozenObjectHeap = 31,
-    CrstFuncPtrStubs = 32,
-    CrstFusionAppCtx = 33,
-    CrstGCCover = 34,
-    CrstGenericDictionaryExpansion = 35,
-    CrstGlobalStrLiteralMap = 36,
-    CrstHandleTable = 37,
-    CrstIbcProfile = 38,
-    CrstIJWFixupData = 39,
-    CrstIJWHash = 40,
-    CrstILStubGen = 41,
-    CrstInlineTrackingMap = 42,
-    CrstInstMethodHashTable = 43,
-    CrstInterfaceDispatchGlobalLists = 44,
-    CrstInterop = 45,
-    CrstInteropData = 46,
-    CrstIsJMCMethod = 47,
-    CrstISymUnmanagedReader = 48,
-    CrstJit = 49,
-    CrstJitInlineTrackingMap = 50,
-    CrstJitPatchpoint = 51,
-    CrstJumpStubCache = 52,
-    CrstLeafLock = 53,
-    CrstListLock = 54,
-    CrstLoaderAllocator = 55,
-    CrstLoaderAllocatorReferences = 56,
-    CrstLoaderHeap = 57,
-    CrstManagedObjectWrapperMap = 58,
-    CrstMethodDescBackpatchInfoTracker = 59,
-    CrstMethodTableExposedObject = 60,
-    CrstModule = 61,
-    CrstModuleLookupTable = 62,
-    CrstMulticoreJitHash = 63,
-    CrstMulticoreJitManager = 64,
-    CrstNativeImageEagerFixups = 65,
-    CrstNativeImageLoad = 66,
-    CrstNotifyGdb = 67,
-    CrstPEImage = 68,
-    CrstPendingTypeLoadEntry = 69,
-    CrstPerfMap = 70,
-    CrstPgoData = 71,
-    CrstPinnedByrefValidation = 72,
-    CrstPinnedHeapHandleTable = 73,
-    CrstProfilerGCRefDataFreeList = 74,
-    CrstProfilingAPIStatus = 75,
-    CrstRCWCache = 76,
-    CrstRCWCleanupList = 77,
-    CrstReadyToRunEntryPointToMethodDescMap = 78,
-    CrstReflection = 79,
-    CrstReJITGlobalRequest = 80,
-    CrstSigConvert = 81,
-    CrstSingleUseLock = 82,
-    CrstStressLog = 83,
-    CrstStubCache = 84,
-    CrstStubDispatchCache = 85,
-    CrstSyncBlockCache = 86,
-    CrstSyncHashLock = 87,
-    CrstSystemDomain = 88,
-    CrstSystemDomainDelayedUnloadList = 89,
-    CrstThreadIdDispenser = 90,
-    CrstThreadLocalStorageLock = 91,
-    CrstThreadStore = 92,
-    CrstTieredCompilation = 93,
-    CrstTypeEquivalenceMap = 94,
-    CrstTypeIDMap = 95,
-    CrstUMEntryThunkCache = 96,
-    CrstUMEntryThunkFreeListLock = 97,
-    CrstUniqueStack = 98,
-    CrstUnresolvedClassLock = 99,
-    CrstUnwindInfoTableLock = 100,
-    CrstVSDIndirectionCellLock = 101,
-    CrstWrapperTemplate = 102,
-    kNumberOfCrstTypes = 103
+    CrstCallStubCache = 5,
+    CrstCCompRC = 6,
+    CrstClassFactInfoHash = 7,
+    CrstClassInit = 8,
+    CrstClrNotification = 9,
+    CrstCodeFragmentHeap = 10,
+    CrstCodeVersioning = 11,
+    CrstCOMCallWrapper = 12,
+    CrstCOMWrapperCache = 13,
+    CrstDataTest1 = 14,
+    CrstDataTest2 = 15,
+    CrstDbgTransport = 16,
+    CrstDeadlockDetection = 17,
+    CrstDebuggerController = 18,
+    CrstDebuggerFavorLock = 19,
+    CrstDebuggerHeapExecMemLock = 20,
+    CrstDebuggerHeapLock = 21,
+    CrstDebuggerJitInfo = 22,
+    CrstDebuggerMutex = 23,
+    CrstDynamicIL = 24,
+    CrstDynamicMT = 25,
+    CrstEtwTypeLogHash = 26,
+    CrstEventPipe = 27,
+    CrstEventStore = 28,
+    CrstException = 29,
+    CrstExecutableAllocatorLock = 30,
+    CrstFCall = 31,
+    CrstFrozenObjectHeap = 32,
+    CrstFuncPtrStubs = 33,
+    CrstFusionAppCtx = 34,
+    CrstGCCover = 35,
+    CrstGenericDictionaryExpansion = 36,
+    CrstGlobalStrLiteralMap = 37,
+    CrstHandleTable = 38,
+    CrstIbcProfile = 39,
+    CrstIJWFixupData = 40,
+    CrstIJWHash = 41,
+    CrstILStubGen = 42,
+    CrstInlineTrackingMap = 43,
+    CrstInstMethodHashTable = 44,
+    CrstInterfaceDispatchGlobalLists = 45,
+    CrstInterop = 46,
+    CrstInteropData = 47,
+    CrstIsJMCMethod = 48,
+    CrstISymUnmanagedReader = 49,
+    CrstJit = 50,
+    CrstJitInlineTrackingMap = 51,
+    CrstJitPatchpoint = 52,
+    CrstJumpStubCache = 53,
+    CrstLeafLock = 54,
+    CrstListLock = 55,
+    CrstLoaderAllocator = 56,
+    CrstLoaderAllocatorReferences = 57,
+    CrstLoaderHeap = 58,
+    CrstManagedObjectWrapperMap = 59,
+    CrstMethodDescBackpatchInfoTracker = 60,
+    CrstMethodTableExposedObject = 61,
+    CrstModule = 62,
+    CrstModuleLookupTable = 63,
+    CrstMulticoreJitHash = 64,
+    CrstMulticoreJitManager = 65,
+    CrstNativeImageEagerFixups = 66,
+    CrstNativeImageLoad = 67,
+    CrstNotifyGdb = 68,
+    CrstPEImage = 69,
+    CrstPendingTypeLoadEntry = 70,
+    CrstPerfMap = 71,
+    CrstPgoData = 72,
+    CrstPinnedByrefValidation = 73,
+    CrstPinnedHeapHandleTable = 74,
+    CrstProfilerGCRefDataFreeList = 75,
+    CrstProfilingAPIStatus = 76,
+    CrstRCWCache = 77,
+    CrstRCWCleanupList = 78,
+    CrstReadyToRunEntryPointToMethodDescMap = 79,
+    CrstReflection = 80,
+    CrstReJITGlobalRequest = 81,
+    CrstSigConvert = 82,
+    CrstSingleUseLock = 83,
+    CrstStressLog = 84,
+    CrstStubCache = 85,
+    CrstStubDispatchCache = 86,
+    CrstSyncBlockCache = 87,
+    CrstSyncHashLock = 88,
+    CrstSystemDomain = 89,
+    CrstSystemDomainDelayedUnloadList = 90,
+    CrstThreadIdDispenser = 91,
+    CrstThreadLocalStorageLock = 92,
+    CrstThreadStore = 93,
+    CrstTieredCompilation = 94,
+    CrstTypeEquivalenceMap = 95,
+    CrstTypeIDMap = 96,
+    CrstUMEntryThunkCache = 97,
+    CrstUMEntryThunkFreeListLock = 98,
+    CrstUniqueStack = 99,
+    CrstUnresolvedClassLock = 100,
+    CrstUnwindInfoTableLock = 101,
+    CrstVSDIndirectionCellLock = 102,
+    CrstWrapperTemplate = 103,
+    kNumberOfCrstTypes = 104
 };
 
 #endif // __CRST_TYPES_INCLUDED
@@ -134,6 +135,7 @@ int g_rgCrstLevelMap[] =
     13,         // CrstAssemblyLoader
     3,          // CrstAvailableClass
     4,          // CrstAvailableParamTypes
+    3,          // CrstCallStubCache
     -1,         // CrstCCompRC
     14,         // CrstClassFactInfoHash
     10,         // CrstClassInit
@@ -242,6 +244,7 @@ LPCSTR g_rgCrstNameMap[] =
     "CrstAssemblyLoader",
     "CrstAvailableClass",
     "CrstAvailableParamTypes",
+    "CrstCallStubCache",
     "CrstCCompRC",
     "CrstClassFactInfoHash",
     "CrstClassInit",

src/coreclr/inc/icorjitinfoimpl_generated.h

@@ -590,6 +590,9 @@ void* GetCookieForPInvokeCalliSig(
           CORINFO_SIG_INFO* szMetaSig,
           void** ppIndirection) override;
 
+void* GetCookieForInterpreterCalliSig(
+          CORINFO_SIG_INFO* szMetaSig) override;
+
 bool canGetCookieForPInvokeCalliSig(
           CORINFO_SIG_INFO* szMetaSig) override;
 

src/coreclr/inc/jiteeversionguid.h

@@ -37,11 +37,11 @@
 
 #include <minipal/guid.h>
 
-constexpr GUID JITEEVersionIdentifier = { /* ecc9bc7e-9223-4af6-af2f-b63e89c09279 */
-    0xecc9bc7e,
-    0x9223,
-    0x4af6,
-    {0xaf, 0x2f, 0xb6, 0x3e, 0x89, 0xc0, 0x92, 0x79}
+constexpr GUID JITEEVersionIdentifier = { /* f9f14a77-1225-42d0-a21e-6d8b45506fc6 */
+    0xf9f14a77,
+    0x1225,
+    0x42d0,
+    {0xa2, 0x1e, 0x6d, 0x8b, 0x45, 0x50, 0x6f, 0xc6}
   };
 
 #endif // JIT_EE_VERSIONING_GUID_H