diff options
author | Jan Vorlicek <janvorli@microsoft.com> | 2019-02-26 23:46:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-26 23:46:00 +0100 |
commit | 19394b01ed59d3771c0602ec321ec4520bcd2aa2 (patch) | |
tree | 04c42703a3e23e4f7ca8798c96ab36fb38b7984d /src/vm/appdomain.cpp | |
parent | 79341dcfaeb454d684e039e648f2a555f7da4bd0 (diff) | |
download | coreclr-19394b01ed59d3771c0602ec321ec4520bcd2aa2.tar.gz coreclr-19394b01ed59d3771c0602ec321ec4520bcd2aa2.tar.bz2 coreclr-19394b01ed59d3771c0602ec321ec4520bcd2aa2.zip |
Fix Assembly::Load context for collectible assemblies (#22494)
* Fix Assembly::Load context for collectible assemblies
This change fixes a problem when Assembly::Load is called from an
assembly in a collectible AssemblyLoadContext. In that case, we ended up
loading it into the default context instead of the context of the
calling assembly.
Diffstat (limited to 'src/vm/appdomain.cpp')
-rw-r--r-- | src/vm/appdomain.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp index 0be5fd26d0..21161763ef 100644 --- a/src/vm/appdomain.cpp +++ b/src/vm/appdomain.cpp @@ -1175,27 +1175,6 @@ void AppDomain::ShutdownNativeDllSearchDirectories() m_NativeDllSearchDirectories.Clear(); } -void AppDomain::ReleaseDomainBoundInfo() -{ - CONTRACTL - { - NOTHROW; - GC_TRIGGERS; - MODE_ANY; - } - CONTRACTL_END;; - // Shutdown assemblies - m_AssemblyCache.OnAppDomainUnload(); - - AssemblyIterator i = IterateAssembliesEx( (AssemblyIterationFlags)(kIncludeFailedToLoad) ); - CollectibleAssemblyHolder<DomainAssembly *> pDomainAssembly; - - while (i.Next(pDomainAssembly.This())) - { - pDomainAssembly->ReleaseManagedData(); - } -} - void AppDomain::ReleaseFiles() { STANDARD_VM_CONTRACT; |