summaryrefslogtreecommitdiff
path: root/src/vm/dllimport.cpp
diff options
context:
space:
mode:
authorAaron Robinson <arobins@microsoft.com>2018-07-23 03:30:57 -0700
committerJan Kotas <jkotas@microsoft.com>2018-07-23 03:30:57 -0700
commit92d2c4bde42569d2aa22e44550d69f7d743bf9a0 (patch)
tree7e2d617278db482306fb7b6f62c9f53545d917d8 /src/vm/dllimport.cpp
parentcc96914f80b6873c555d0ed377042537ef99f1af (diff)
downloadcoreclr-92d2c4bde42569d2aa22e44550d69f7d743bf9a0.tar.gz
coreclr-92d2c4bde42569d2aa22e44550d69f7d743bf9a0.tar.bz2
coreclr-92d2c4bde42569d2aa22e44550d69f7d743bf9a0.zip
Remove hosthook api (#19079)
* Remove CallNeedsHostHook() API * Remove IsHostHookEnabled() API and with it related dead code * Remove code enabling host hooks (i.e. COMPlus_GenerateStubForHost) Remove function declarations for creating host hooks Update comments
Diffstat (limited to 'src/vm/dllimport.cpp')
-rw-r--r--src/vm/dllimport.cpp57
1 files changed, 3 insertions, 54 deletions
diff --git a/src/vm/dllimport.cpp b/src/vm/dllimport.cpp
index d5376f1460..c45b84dbd9 100644
--- a/src/vm/dllimport.cpp
+++ b/src/vm/dllimport.cpp
@@ -800,14 +800,6 @@ public:
m_slIL.AdjustTargetStackDeltaForExtraParam();
}
-#if defined(_TARGET_X86_)
- // unmanaged CALLI will get an extra arg with the real target address if host hook is enabled
- if (SF_IsCALLIStub(m_dwStubFlags) && NDirect::IsHostHookEnabled())
- {
- pcsMarshal->SetStubTargetArgType(ELEMENT_TYPE_I, false);
- }
-#endif // _TARGET_X86_
-
// Don't touch target signatures from this point on otherwise it messes up the
// cache in ILStubState::GetStubTargetMethodSig.
@@ -1396,12 +1388,7 @@ public:
BinderMethodID getCOMIPMethod;
bool fDoPostCallIPCleanup = true;
- if (!SF_IsNGENedStub(dwStubFlags) && NDirect::IsHostHookEnabled())
- {
- // always use the non-optimized helper if we are hosted
- getCOMIPMethod = METHOD__STUBHELPERS__GET_COM_IP_FROM_RCW;
- }
- else if (SF_IsWinRTStub(dwStubFlags))
+ if (SF_IsWinRTStub(dwStubFlags))
{
// WinRT uses optimized helpers
if (SF_IsWinRTSharedGenericStub(dwStubFlags))
@@ -5196,17 +5183,6 @@ MethodDesc* GetStubMethodDescFromInteropMethodDesc(MethodDesc* pMD, DWORD dwStub
}
#endif // MDA_SUPPORTED
- if (NDirect::IsHostHookEnabled())
- {
- MethodTable *pMT = pMD->GetMethodTable();
- if (pMT->IsProjectedFromWinRT() || pMT->IsWinRTRedirectedInterface(TypeHandle::Interop_ManagedToNative))
- {
- // WinRT NGENed stubs are optimized for the non-hosted scenario and
- // must be rejected if we are hosted.
- return NULL;
- }
- }
-
if (fGcMdaEnabled)
return NULL;
@@ -5229,13 +5205,6 @@ MethodDesc* GetStubMethodDescFromInteropMethodDesc(MethodDesc* pMD, DWORD dwStub
#ifdef FEATURE_COMINTEROP
if (SF_IsWinRTDelegateStub(dwStubFlags))
{
- if (NDirect::IsHostHookEnabled() && pMD->GetMethodTable()->IsProjectedFromWinRT())
- {
- // WinRT NGENed stubs are optimized for the non-hosted scenario and
- // must be rejected if we are hosted.
- return NULL;
- }
-
return pClass->m_pComPlusCallInfo->m_pStubMD.GetValueMaybeNull();
}
else
@@ -5592,33 +5561,13 @@ VOID NDirectMethodDesc::SetNDirectTarget(LPVOID pTarget)
Stub *pInterceptStub = NULL;
- BOOL fHook = FALSE;
-
- // Host hooks are not supported for Mac CoreCLR.
- if (NDirect::IsHostHookEnabled())
- {
-#ifdef _WIN64
- // we will call CallNeedsHostHook on every invocation for back compat
- fHook = TRUE;
-#else // _WIN64
- fHook = CallNeedsHostHook((size_t)pTarget);
-#endif // _WIN64
-
-#ifdef _DEBUG
- if (g_pConfig->ShouldGenerateStubForHost())
- {
- fHook = TRUE;
- }
-#endif
- }
-
#ifdef _TARGET_X86_
#ifdef MDA_SUPPORTED
if (!IsQCall() && MDA_GET_ASSISTANT(PInvokeStackImbalance))
{
- pInterceptStub = GenerateStubForMDA(pTarget, pInterceptStub, fHook);
+ pInterceptStub = GenerateStubForMDA(pTarget, pInterceptStub);
}
#endif // MDA_SUPPORTED
@@ -5630,7 +5579,7 @@ VOID NDirectMethodDesc::SetNDirectTarget(LPVOID pTarget)
EnsureWritablePages(pWriteableData);
g_IBCLogger.LogNDirectCodeAccess(this);
- if (pInterceptStub != NULL WIN64_ONLY(|| fHook))
+ if (pInterceptStub != NULL)
{
ndirect.m_pNativeNDirectTarget = pTarget;