From f2ca070a0ab3b75054a225d5908405f83268c920 Mon Sep 17 00:00:00 2001 From: Konstantin Baladurin Date: Mon, 11 Feb 2019 19:20:50 +0300 Subject: [PATCH] prestub: fix ExternalMethodFixupWorker (#22519) Use DispatchToken::CreateDispatchToken to get token to resolve virtual method in case of non interface MT. --- src/vm/prestub.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vm/prestub.cpp b/src/vm/prestub.cpp index 0f3d96d..d04a5d0 100644 --- a/src/vm/prestub.cpp +++ b/src/vm/prestub.cpp @@ -2378,7 +2378,11 @@ EXTERN_C PCODE STDCALL ExternalMethodFixupWorker(TransitionBlock * pTransitionBl DispatchToken token; if (pMT->IsInterface() || MethodTable::VTableIndir_t::isRelative) { - token = pMT->GetLoaderAllocator()->GetDispatchToken(pMT->GetTypeID(), slot); + if (pMT->IsInterface()) + token = pMT->GetLoaderAllocator()->GetDispatchToken(pMT->GetTypeID(), slot); + else + token = DispatchToken::CreateDispatchToken(slot); + StubCallSite callSite(pIndirection, pEMFrame->GetReturnAddress()); pCode = pMgr->ResolveWorker(&callSite, protectedObj, token, VirtualCallStubManager::SK_LOOKUP); } -- 2.7.4