Skip to content

Commit 7d4bea2

Browse files
authored
Apply batched suggestions from code review
Co-authored-by: Elinor Fung <[email protected]>
1 parent e477ca3 commit 7d4bea2

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

‎src/coreclr/vm/assemblyspec.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,8 @@ AssemblyBinder* AssemblySpec::GetInitialBinder()
273273
}
274274
CONTRACTL_END;
275275

276-
// If the caller explicitly named the load context to bind against
277-
// (AssemblyLoadContext.LoadFromAssemblyName), it wins over the parent's context.
278-
if (GetExplicitBinder() != NULL)
276+
// If the caller explicitly named the load context to bind against, it wins over the parent's context.
277+
if (GetExplicitBinder() != NULL)
279278
return GetExplicitBinder();
280279

281280
AssemblyBinder *pParentAssemblyBinder = NULL;

‎src/coreclr/vm/assemblyspec.hpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,9 @@ class AssemblySpec : public BaseAssemblySpec
5353
private:
5454
Assembly *m_pParentAssembly;
5555

56-
// The binder to bind against, when the caller has explicitly named the load context to use
57-
// (AssemblyLoadContext.LoadFromAssemblyName). When set, it takes precedence over the binder
58-
// of the parent assembly.
59-
AssemblyBinder *m_pExplicitBinder;
56+
// The initial binder to use when the caller explicitly provided a load context for this load.
57+
// When set, it takes precedence over the binder of the parent assembly as the initial binder.
58+
AssemblyBinder *m_pExplicitBinder;
6059

6160
HRESULT InitializeSpecInternal(mdToken kAssemblyRefOrDef,
6261
IMDInternalImport *pImport,

0 commit comments

Comments
 (0)