diff options
| author | Aaron Robinson <arobins@microsoft.com> | 2019-03-04 18:58:56 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-04 18:58:56 -0800 |
| commit | 88ada237f7765b7edd39967adab8ea2ba25ea16c (patch) | |
| tree | aa06f4463840d434d0670104006b8119e43f5a4a /src/vm/appdomain.cpp | |
| parent | 77fcaf6b738941a0c5dc3c00b70b49c7d9f63b69 (diff) | |
| download | coreclr-88ada237f7765b7edd39967adab8ea2ba25ea16c.tar.gz coreclr-88ada237f7765b7edd39967adab8ea2ba25ea16c.tar.bz2 coreclr-88ada237f7765b7edd39967adab8ea2ba25ea16c.zip | |
Remove loose dependency in runtime on System.ComponentModel. (#23010)
Remove loose dependency in runtime on System.ComponentModel.
Disable test to sync with CoreFX
Diffstat (limited to 'src/vm/appdomain.cpp')
| -rw-r--r-- | src/vm/appdomain.cpp | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp index 21161763ef..563de46075 100644 --- a/src/vm/appdomain.cpp +++ b/src/vm/appdomain.cpp @@ -1828,47 +1828,6 @@ void BaseDomain::InitLargeHeapHandleTable() #endif } -#ifdef FEATURE_COMINTEROP -MethodTable* AppDomain::GetLicenseInteropHelperMethodTable() -{ - CONTRACTL - { - THROWS; - GC_TRIGGERS; - } - CONTRACTL_END; - - if(m_pLicenseInteropHelperMT == NULL) - { - // Do this work outside of the lock so we don't have an unbreakable lock condition - - TypeHandle licenseMgrTypeHnd; - MethodDescCallSite loadLM(METHOD__MARSHAL__LOAD_LICENSE_MANAGER); - - licenseMgrTypeHnd = (MethodTable*) loadLM.Call_RetLPVOID((ARG_SLOT*)NULL); - - // - // Look up this method by name, because the type is actually declared in System.dll. <TODO>@todo: why?</TODO> - // - - MethodDesc *pGetLIHMD = MemberLoader::FindMethod(licenseMgrTypeHnd.AsMethodTable(), - "GetLicenseInteropHelperType", &gsig_SM_Void_RetIntPtr); - _ASSERTE(pGetLIHMD); - - TypeHandle lihTypeHnd; - - MethodDescCallSite getLIH(pGetLIHMD); - lihTypeHnd = (MethodTable*) getLIH.Call_RetLPVOID((ARG_SLOT*)NULL); - - BaseDomain::LockHolder lh(this); - - if(m_pLicenseInteropHelperMT == NULL) - m_pLicenseInteropHelperMT = lihTypeHnd.AsMethodTable(); - } - return m_pLicenseInteropHelperMT; -} -#endif // FEATURE_COMINTEROP - #endif // CROSSGEN_COMPILE //***************************************************************************** @@ -3489,7 +3448,6 @@ AppDomain::AppDomain() #ifdef FEATURE_COMINTEROP m_pRCWCache = NULL; m_pRCWRefCache = NULL; - m_pLicenseInteropHelperMT = NULL; memset(m_rpCLRTypes, 0, sizeof(m_rpCLRTypes)); #endif // FEATURE_COMINTEROP |