diff options
Diffstat (limited to 'src/vm/assemblyspec.cpp')
| -rw-r--r-- | src/vm/assemblyspec.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/vm/assemblyspec.cpp b/src/vm/assemblyspec.cpp index e278c002fc..e5952c24d2 100644 --- a/src/vm/assemblyspec.cpp +++ b/src/vm/assemblyspec.cpp @@ -785,15 +785,6 @@ ICLRPrivBinder* AssemblySpec::GetBindingContextFromParentAssembly(AppDomain *pDo // ICLRPrivAssembly implements ICLRPrivBinder and thus, "is a" binder in a manner of semantics. pParentAssemblyBinder = pParentPEAssembly->GetBindingContext(); - if (pParentAssemblyBinder == NULL) - { - if (pParentPEAssembly->IsDynamic()) - { - // If the parent assembly is dynamically generated, then use its fallback load context - // as the binder. - pParentAssemblyBinder = pParentPEAssembly->GetFallbackLoadContextBinder(); - } - } } if (GetPreferFallbackLoadContextBinder()) @@ -811,13 +802,12 @@ ICLRPrivBinder* AssemblySpec::GetBindingContextFromParentAssembly(AppDomain *pDo // // 1) Domain Neutral assembly // 2) Entrypoint assembly - // 3) RefEmitted assembly - // 4) AssemblyLoadContext.LoadFromAssemblyName + // 3) AssemblyLoadContext.LoadFromAssemblyName // // For (1) and (2), we will need to bind against the DefaultContext binder (aka TPA Binder). This happens // below if we do not find the parent assembly binder. // - // For (3) and (4), fetch the fallback load context binder reference. + // For (3), fetch the fallback load context binder reference. pParentAssemblyBinder = GetFallbackLoadContextBinderForRequestingAssembly(); } |