diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2017-04-28 16:06:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-28 16:06:54 -0700 |
| commit | b38113c80d04c39890207d149bf0359a86711d62 (patch) | |
| tree | 61f35c08f07b230eb9c40c44f80b74c15d00394d /src/vm/assemblynative.cpp | |
| parent | 68a9cf4cdc39eea027b01ccbc98531503590a6e3 (diff) | |
| download | coreclr-b38113c80d04c39890207d149bf0359a86711d62.tar.gz coreclr-b38113c80d04c39890207d149bf0359a86711d62.tar.bz2 coreclr-b38113c80d04c39890207d149bf0359a86711d62.zip | |
Correctly enumerate loaded assemblies in AppDomain (#11294)
* Correctly enumerate loaded assemblies in AppDomain
* Remove unrequired attribute
Diffstat (limited to 'src/vm/assemblynative.cpp')
| -rw-r--r-- | src/vm/assemblynative.cpp | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/vm/assemblynative.cpp b/src/vm/assemblynative.cpp index b9079ec06a..702c255c97 100644 --- a/src/vm/assemblynative.cpp +++ b/src/vm/assemblynative.cpp @@ -536,42 +536,6 @@ Assembly* AssemblyNative::LoadFromPEImage(ICLRPrivBinder* pBinderContext, PEImag RETURN pLoadedAssembly; } -/* static */ -void QCALLTYPE AssemblyNative::GetLoadedAssembliesInternal(QCall::ObjectHandleOnStack assemblies) -{ - QCALL_CONTRACT; - - BEGIN_QCALL; - - MethodTable * pAssemblyClass = MscorlibBinder::GetClass(CLASS__ASSEMBLY); - - PTR_AppDomain pCurDomain = GetAppDomain(); - - SetSHash<PTR_DomainAssembly> assemblySet; - pCurDomain->GetCacheAssemblyList(assemblySet); - size_t nArrayElems = assemblySet.GetCount(); - PTRARRAYREF AsmArray = NULL; - - GCX_COOP(); - - GCPROTECT_BEGIN(AsmArray); - AsmArray = (PTRARRAYREF) AllocateObjectArray( (DWORD)nArrayElems, pAssemblyClass); - for(auto it = assemblySet.Begin(); it != assemblySet.End(); it++) - { - PTR_DomainAssembly assem = *it; - OBJECTREF o = (OBJECTREF)assem->GetExposedAssemblyObject(); - _ASSERTE(o != NULL); - _ASSERTE(nArrayElems > 0); - AsmArray->SetAt(--nArrayElems, o); - } - - assemblies.Set(AsmArray); - - GCPROTECT_END(); - - END_QCALL; -} - /* static */ void QCALLTYPE AssemblyNative::LoadFromPath(INT_PTR ptrNativeAssemblyLoadContext, LPCWSTR pwzILPath, LPCWSTR pwzNIPath, QCall::ObjectHandleOnStack retLoadedAssembly) { |