PR feedback

dotnet · Sep 23, 2021 · 84cbd4a · 84cbd4a
1 parent f12b470
commit 84cbd4a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 42 deletions.
diff --git a/src/coreclr/binder/assemblybindercommon.cpp b/src/coreclr/binder/assemblybindercommon.cpp
@@ -38,6 +38,10 @@ extern HRESULT RuntimeInvokeHostAssemblyResolver(INT_PTR pManagedAssemblyLoadCon
 
 #endif // !defined(DACCESS_COMPILE)
 
+STDAPI BinderAcquirePEImage(LPCTSTR            szAssemblyPath,
+    PEImage** ppPEImage,
+    BundleFileLocation bundleFileLocation);
+
 namespace BINDER_SPACE
 {
     namespace
@@ -1350,7 +1354,7 @@ HRESULT AssemblyBinderCommon::BindUsingPEImage(/* in */  AssemblyBinder* pBinder
                 }
                 EX_CATCH
                 {
-                    hr = E_FAIL;
+                    hr = GET_EXCEPTION()->GetHR();
                     goto Exit;
                 }
                 EX_END_CATCH(SwallowAllExceptions);

diff --git a/src/coreclr/binder/assemblyname.cpp b/src/coreclr/binder/assemblyname.cpp
@@ -29,6 +29,10 @@ namespace
     const WCHAR* s_neutralCulture = W("neutral");
 }
 
+STDAPI BinderAcquireImport(PEImage* pPEImage,
+    IMDInternalImport** pIMetaDataAssemblyImport,
+    DWORD* pdwPAFlags);
+
 namespace BINDER_SPACE
 {
     AssemblyName::AssemblyName()
@@ -57,6 +61,7 @@ namespace BINDER_SPACE
         DWORD dwPAFlags[2];
         IF_FAIL_GO(BinderAcquireImport(pPEImage, &pIMetaDataAssemblyImport, dwPAFlags));
         IF_FAIL_GO(AssemblyBinderCommon::TranslatePEToArchitectureType(dwPAFlags, &PeKind));
+        SetArchitecture(PeKind);
 
         _ASSERTE(pIMetaDataAssemblyImport != NULL);
 
@@ -147,8 +152,6 @@ namespace BINDER_SPACE
             SetHave(AssemblyIdentity::IDENTITY_FLAG_PUBLIC_KEY_TOKEN);
         }
 
-        SetArchitecture(PeKind);
-
     Exit:
         return hr;
     }

diff --git a/src/coreclr/binder/inc/assemblybindercommon.hpp b/src/coreclr/binder/inc/assemblybindercommon.hpp
@@ -23,14 +23,6 @@ class DefaultAssemblyBinder;
 class PEAssembly;
 class PEImage;
 
-STDAPI BinderAcquirePEImage(LPCTSTR            szAssemblyPath,
-                            PEImage            ** ppPEImage,
-                            BundleFileLocation bundleFileLocation);
-
-STDAPI BinderAcquireImport(PEImage* pPEImage,
-                           IMDInternalImport** pIMetaDataAssemblyImport,
-                           DWORD* pdwPAFlags);
-
 namespace BINDER_SPACE
 {
     class AssemblyIdentityUTF8;

diff --git a/src/coreclr/vm/baseassemblyspec.cpp b/src/coreclr/vm/baseassemblyspec.cpp
@@ -103,32 +103,6 @@ BOOL BaseAssemblySpec::IsCoreLib()
                ( (iNameLen == CoreLibNameLen) || (m_pAssemblyName[CoreLibNameLen] == ',') ) ) ) );
 }
 
-BOOL BaseAssemblySpec::IsAssemblySpecForCoreLib()
-{
-    CONTRACTL
-    {
-        NOTHROW;
-        INSTANCE_CHECK;
-        GC_NOTRIGGER;
-        MODE_ANY;
-        PRECONDITION(strlen(g_psBaseLibraryName) == CoreLibNameLen);
-    }
-    CONTRACTL_END;
-
-    BOOL fIsAssemblySpecForCoreLib = FALSE;
-
-    if (m_pAssemblyName)
-    {
-        size_t iNameLen = strlen(m_pAssemblyName);
-        fIsAssemblySpecForCoreLib = ( (iNameLen >= CoreLibNameLen) &&
-                 ( (!_stricmp(m_pAssemblyName, g_psBaseLibrary)) ||
-                 ( (!_strnicmp(m_pAssemblyName, g_psBaseLibraryName, CoreLibNameLen)) &&
-                   ( (iNameLen == CoreLibNameLen) || (m_pAssemblyName[CoreLibNameLen] == ',') ) ) ) );
-    }
-
-    return fIsAssemblySpecForCoreLib;
-}
-
 #define CORELIB_PUBLICKEY g_rbTheSilverlightPlatformKey
 
 

diff --git a/src/coreclr/vm/baseassemblyspec.h b/src/coreclr/vm/baseassemblyspec.h
@@ -77,8 +77,6 @@ class BaseAssemblySpec
         return m_pBinder;
     }
 
-    BOOL IsAssemblySpecForCoreLib();
-
     HRESULT ParseName();
     DWORD Hash();
 

diff --git a/src/coreclr/vm/coreassemblyspec.cpp b/src/coreclr/vm/coreassemblyspec.cpp
@@ -186,7 +186,7 @@ HRESULT BaseAssemblySpec::ParseName()
 
     EX_TRY
     {
-        NewHolder<BINDER_SPACE::AssemblyIdentityUTF8> pAssemblyIdentity;
+        BINDER_SPACE::AssemblyIdentityUTF8* pAssemblyIdentity;
         AppDomain *pDomain = ::GetAppDomain();
         _ASSERTE(pDomain);
 
@@ -221,8 +221,6 @@ HRESULT BaseAssemblySpec::ParseName()
 
         // Copy and own any fields we do not already own
         CloneFields();
-
-        pAssemblyIdentity.SuppressRelease();
     }
     EX_CATCH_HRESULT(hr);