diff options
author | Jan Kotas <jkotas@microsoft.com> | 2018-12-10 02:57:57 -0800 |
---|---|---|
committer | Jan Vorlicek <janvorli@microsoft.com> | 2018-12-10 11:57:57 +0100 |
commit | 49ca3db92a48da71d25c607af9716a30bafb3ff8 (patch) | |
tree | edef4dd6526f291d37ad7dc783b52c124e834634 /src/vm/comcallablewrapper.h | |
parent | bc03ef9aeb467950f181a2e2d53fe4b92a98d0c9 (diff) | |
download | coreclr-49ca3db92a48da71d25c607af9716a30bafb3ff8.tar.gz coreclr-49ca3db92a48da71d25c607af9716a30bafb3ff8.tar.bz2 coreclr-49ca3db92a48da71d25c607af9716a30bafb3ff8.zip |
Delete vm/context.* (#21459)
* Delete vm/context.*
Leftover from remoting
Diffstat (limited to 'src/vm/comcallablewrapper.h')
-rw-r--r-- | src/vm/comcallablewrapper.h | 54 |
1 files changed, 1 insertions, 53 deletions
diff --git a/src/vm/comcallablewrapper.h b/src/vm/comcallablewrapper.h index 34587ac5ff..27206ac98f 100644 --- a/src/vm/comcallablewrapper.h +++ b/src/vm/comcallablewrapper.h @@ -998,12 +998,6 @@ private: public: ADID GetDomainID(); - // The first overload respects the is-agile flag and context, the other two respect the flag but - // ignore the context (this is mostly for back compat reasons, new code should call the first overload). - BOOL NeedToSwitchDomains(Thread *pThread, ADID *pTargetADID, Context **ppTargetContext); - BOOL NeedToSwitchDomains(Thread *pThread); - BOOL NeedToSwitchDomains(ADID appdomainID); - VOID ResetHandleStrength(); VOID MarkHandleWeak(); @@ -1383,7 +1377,6 @@ class WeakReferenceImpl : public IUnknownCommon<IWeakReference> { private: ADID m_adid; // AppDomain ID of where this weak reference is created - Context *m_pContext; // Saved context OBJECTHANDLE m_ppObject; // Short weak global handle points back to the object, // created in domain ID = m_adid @@ -1521,7 +1514,7 @@ public: // Init pointer to the vtable of the interface // and the main ComCallWrapper if the interface needs it void InitNew(OBJECTREF oref, ComCallWrapperCache *pWrapperCache, ComCallWrapper* pWrap, - ComCallWrapper *pClassWrap, Context* pContext, SyncBlock* pSyncBlock, + ComCallWrapper *pClassWrap, SyncBlock* pSyncBlock, ComCallWrapperTemplate* pTemplate); // used by reconnect wrapper to new object @@ -1603,17 +1596,6 @@ public: return m_dwDomainId; } - inline BOOL NeedToSwitchDomains(Thread *pThread, ADID *pTargetADID, Context **ppTargetContext) - { - LIMITED_METHOD_DAC_CONTRACT; - return FALSE; - } - inline BOOL NeedToSwitchDomains(ADID appdomainID) - { - LIMITED_METHOD_DAC_CONTRACT; - return FALSE; - } - // is the object aggregated by a COM component BOOL IsAggregated() { @@ -2099,7 +2081,6 @@ private: PTR_ComCallWrapper m_pWrap; // the first ComCallWrapper associated with this SimpleComCallWrapper PTR_ComCallWrapper m_pClassWrap; // the first ComCallWrapper associated with the class (only if m_pMT is an interface) MethodTable* m_pMT; - Context* m_pContext; ComCallWrapperCache* m_pWrapperCache; PTR_ComCallWrapperTemplate m_pTemplate; @@ -2173,39 +2154,6 @@ inline ComCallWrapper* __stdcall ComCallWrapper::InlineGetWrapper(OBJECTREF* ppO RETURN pWrap; } -#ifndef CROSSGEN_COMPILE - -inline BOOL ComCallWrapper::NeedToSwitchDomains(Thread *pThread, ADID *pTargetADID, Context **ppTargetContext) -{ - WRAPPER_NO_CONTRACT; - - return GetSimpleWrapper()->NeedToSwitchDomains(pThread, pTargetADID, ppTargetContext); -} - -inline BOOL ComCallWrapper::NeedToSwitchDomains(Thread *pThread) -{ - CONTRACTL - { - NOTHROW; - GC_NOTRIGGER; - MODE_ANY; - SO_TOLERANT; - } - CONTRACTL_END; - - return NeedToSwitchDomains(pThread->GetDomain()->GetId()); -} - - -inline BOOL ComCallWrapper::NeedToSwitchDomains(ADID appdomainID) -{ - WRAPPER_NO_CONTRACT; - - return GetSimpleWrapper()->NeedToSwitchDomains(appdomainID); -} - -#endif // CROSSGEN_COMPILE - inline ADID ComCallWrapper::GetDomainID() { WRAPPER_NO_CONTRACT; |