diff options
author | danmosemsft <danmose@microsoft.com> | 2017-02-12 16:51:48 -0800 |
---|---|---|
committer | danmosemsft <danmose@microsoft.com> | 2017-02-12 17:00:53 -0800 |
commit | b9f410b7b85d3948aece3aa009885df244f11e41 (patch) | |
tree | 4adbb4ae045896b11f373794e79b572e26d2def1 /src/vm/typeparse.cpp | |
parent | 206b6a7efbc2e947eff900f448b86573b77ae392 (diff) | |
download | coreclr-b9f410b7b85d3948aece3aa009885df244f11e41.tar.gz coreclr-b9f410b7b85d3948aece3aa009885df244f11e41.tar.bz2 coreclr-b9f410b7b85d3948aece3aa009885df244f11e41.zip |
Remove never defined FEATURE_FUSION
Diffstat (limited to 'src/vm/typeparse.cpp')
-rw-r--r-- | src/vm/typeparse.cpp | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/src/vm/typeparse.cpp b/src/vm/typeparse.cpp index 2cd3b19873..68ff76273d 100644 --- a/src/vm/typeparse.cpp +++ b/src/vm/typeparse.cpp @@ -1570,15 +1570,6 @@ TypeHandle TypeName::GetTypeFromAsm(BOOL bForIntrospection) _ASSERTE(!"You must pass either a asm-qualified typename or an actual Assembly."); } -#ifdef FEATURE_FUSION - if (th.IsNull() && bLoadTypeFromPartialNameHack && GetAssembly() && !GetAssembly()->IsEmpty()) - { - DomainAssembly* pPartialBindAssemblyHack = LoadAssemblyFromPartialNameHack(GetAssembly()); - - if (pPartialBindAssemblyHack) - th = GetTypeHaveAssembly(pPartialBindAssemblyHack->GetAssembly(), bThrowIfNotFound, bIgnoreCase, NULL); - } -#endif // FEATURE_FUSION if (!th.IsNull() && (!m_genericArguments.IsEmpty() || !m_signature.IsEmpty())) { @@ -1819,46 +1810,6 @@ TypeName::GetTypeHaveAssemblyHelper( return th; } // TypeName::GetTypeHaveAssemblyHelper -#ifdef FEATURE_FUSION -DomainAssembly* LoadAssemblyFromPartialNameHack(SString* psszAssemblySpec, BOOL fCropPublicKey) -{ - CONTRACTL - { - MODE_COOPERATIVE; - THROWS; - GC_TRIGGERS; - INJECT_FAULT(COMPlusThrowOM();); - } - CONTRACTL_END; - - MethodDescCallSite loadWithPartialNameHack(METHOD__ASSEMBLY__LOAD_WITH_PARTIAL_NAME_HACK); - ARG_SLOT args[2]; - STRINGREF mszAssembly = NULL; - DomainAssembly* pPartialBindAssemblyHack = NULL; - GCPROTECT_BEGIN(mszAssembly); - { - mszAssembly = StringObject::NewString(psszAssemblySpec->GetUnicode()); - args[0] = ObjToArgSlot(mszAssembly); - args[1] = BoolToArgSlot(fCropPublicKey); - - ASSEMBLYREF assembly = (ASSEMBLYREF)loadWithPartialNameHack.Call_RetOBJECTREF(args); - - if (assembly != NULL) - { - pPartialBindAssemblyHack = (DomainAssembly*) assembly->GetDomainAssembly(); - - if (pPartialBindAssemblyHack->GetAssembly()->IsCollectible()) - { - // Should not be possible to reach - COMPlusThrow(kNotSupportedException, W("NotSupported_CollectibleAssemblyResolve")); - } - } - } - GCPROTECT_END(); - - return pPartialBindAssemblyHack; -} -#endif // FEATURE_FUSION DomainAssembly * LoadDomainAssembly( SString * psszAssemblySpec, |