Delete unmanaged AssemblyName parser

src/coreclr/System.Private.CoreLib/src/System/Reflection/AssemblyName.CoreCLR.cs

@@ -3,9 +3,8 @@
 
 using System.Configuration.Assemblies;
 using System.Globalization;
-using System.IO;
 using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
+using System.Runtime.InteropServices;
 
 namespace System.Reflection
 {
@@ -61,7 +60,7 @@ public void SetVersion(Version? version, ushort defaultValue)
         }
     }
 
-    public sealed partial class AssemblyName : ICloneable, IDeserializationCallback, ISerializable
+    public sealed partial class AssemblyName
     {
         internal unsafe AssemblyName(NativeAssemblyNameParts* pParts)
             : this()
@@ -149,5 +148,31 @@ private static ProcessorArchitecture CalculateProcArchIndex(PortableExecutableKi
             }
             return ProcessorArchitecture.None;
         }
+
+        private static unsafe void ParseAsAssemblySpec(char* pAssemblyName, void* pAssemblySpec)
+        {
+            AssemblyNameParser.AssemblyNameParts parts = AssemblyNameParser.Parse(MemoryMarshal.CreateReadOnlySpanFromNullTerminated(pAssemblyName));
+
+            fixed (char* pName = parts._name)
+            fixed (char* pCultureName = parts._cultureName)
+            fixed (byte* pPublicKeyOrToken = parts._publicKeyOrToken)
+            {
+                NativeAssemblyNameParts nameParts = default;
+
+                nameParts._flags = parts._flags;
+                nameParts._pName = pName;
+                nameParts._pCultureName = pCultureName;
+
+                nameParts._pPublicKeyOrToken = pPublicKeyOrToken;
+                nameParts._cbPublicKeyOrToken = (parts._publicKeyOrToken != null) ? parts._publicKeyOrToken.Length : 0;
+
+                nameParts.SetVersion(parts._version, defaultValue: ushort.MaxValue);
+
+                InitializeAssemblySpec(&nameParts, pAssemblySpec);
+            }
+        }
+
+        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "AssemblyName_InitializeAssemblySpec")]
+        private static unsafe partial void InitializeAssemblySpec(NativeAssemblyNameParts* pAssemblyNameParts, void* pAssemblySpec);
     }
 }

src/coreclr/binder/CMakeLists.txt

@@ -7,12 +7,10 @@ set(BINDER_COMMON_SOURCES
     applicationcontext.cpp
     assembly.cpp
     assemblybindercommon.cpp
-    assemblyidentitycache.cpp
     assemblyname.cpp
     bindertracing.cpp
     defaultassemblybinder.cpp
     failurecache.cpp
-    stringlexer.cpp
     textualidentityparser.cpp
     utils.cpp
 )
@@ -26,7 +24,6 @@ set(BINDER_COMMON_HEADERS
     inc/assemblyentry.hpp
     inc/assemblyhashtraits.hpp
     inc/assemblyidentity.hpp
-    inc/assemblyidentitycache.hpp
     inc/assemblyname.hpp
     inc/assemblyname.inl
     inc/assemblyversion.hpp
@@ -40,8 +37,6 @@ set(BINDER_COMMON_HEADERS
     inc/failurecachehashtraits.hpp
     inc/loadcontext.hpp
     inc/loadcontext.inl
-    inc/stringlexer.hpp
-    inc/stringlexer.inl
     inc/textualidentityparser.hpp
     inc/utils.hpp
 )

src/coreclr/binder/applicationcontext.cpp

@@ -15,7 +15,6 @@
 #include "stringarraylist.h"
 #include "loadcontext.hpp"
 #include "failurecache.hpp"
-#include "assemblyidentitycache.hpp"
 #include "utils.hpp"
 #include "ex.h"
 #include "clr/fs/path.h"
@@ -216,39 +215,6 @@ namespace BINDER_SPACE
         return hr;
     }
 
-    HRESULT ApplicationContext::GetAssemblyIdentity(LPCSTR                 szTextualIdentity,
-                                                    AssemblyIdentityUTF8 **ppAssemblyIdentity)
-    {
-        HRESULT hr = S_OK;
-
-        _ASSERTE(szTextualIdentity != NULL);
-        _ASSERTE(ppAssemblyIdentity != NULL);
-
-        CRITSEC_Holder contextLock(GetCriticalSectionCookie());
-
-        AssemblyIdentityUTF8 *pAssemblyIdentity = m_assemblyIdentityCache.Lookup(szTextualIdentity);
-        if (pAssemblyIdentity == NULL)
-        {
-            NewHolder<AssemblyIdentityUTF8> pNewAssemblyIdentity;
-            SString sTextualIdentity;
-
-            SAFE_NEW(pNewAssemblyIdentity, AssemblyIdentityUTF8);
-            sTextualIdentity.SetUTF8(szTextualIdentity);
-
-            IF_FAIL_GO(TextualIdentityParser::Parse(sTextualIdentity, pNewAssemblyIdentity));
-            IF_FAIL_GO(m_assemblyIdentityCache.Add(szTextualIdentity, pNewAssemblyIdentity));
-
-            pNewAssemblyIdentity->PopulateUTF8Fields();
-
-            pAssemblyIdentity = pNewAssemblyIdentity.Extract();
-        }
-
-        *ppAssemblyIdentity = pAssemblyIdentity;
-
-    Exit:
-        return hr;
-    }
-
     bool ApplicationContext::IsTpaListProvided()
     {
         return m_pTrustedPlatformAssemblyMap != nullptr;

src/coreclr/binder/inc/applicationcontext.hpp

@@ -16,7 +16,6 @@
 
 #include "bindertypes.hpp"
 #include "failurecache.hpp"
-#include "assemblyidentitycache.hpp"
 #include "stringarraylist.h"
 
 namespace BINDER_SPACE
@@ -94,9 +93,6 @@ namespace BINDER_SPACE
                                   /* in */ SString &sAppPaths,
                                   /* in */ BOOL     fAcquireLock);
 
-        HRESULT GetAssemblyIdentity(/* in */ LPCSTR                szTextualIdentity,
-                                    /* in */ AssemblyIdentityUTF8 **ppAssemblyIdentity);
-
         // Getters/Setter
         inline ExecutionContext *GetExecutionContext();
         inline FailureCache *GetFailureCache();
@@ -119,8 +115,6 @@ namespace BINDER_SPACE
         FailureCache      *m_pFailureCache;
         CRITSEC_COOKIE     m_contextCS;
 
-        AssemblyIdentityCache m_assemblyIdentityCache;
-
         StringArrayList    m_platformResourceRoots;
         StringArrayList    m_appPaths;
 

src/coreclr/binder/inc/assemblybindercommon.hpp

@@ -25,8 +25,6 @@ class PEImage;
 
 namespace BINDER_SPACE
 {
-    class AssemblyIdentityUTF8;
-
     class AssemblyBinderCommon
     {
     public:

src/coreclr/binder/inc/assemblyidentity.hpp

@@ -81,49 +81,6 @@ namespace BINDER_SPACE
         AssemblyContentType m_kContentType;
         DWORD               m_dwIdentityFlags;
     };
-
-    class AssemblyIdentityUTF8 final : public AssemblyIdentity
-    {
-    public:
-        AssemblyIdentityUTF8()
-        {
-            m_szSimpleNameUTF8 = NULL;
-            m_szCultureOrLanguageUTF8 = NULL;
-        }
-
-        void PopulateUTF8Fields()
-        {
-            m_szSimpleNameUTF8 = m_simpleName.GetUTF8(sSimpleNameBuffer);
-
-            if (Have(IDENTITY_FLAG_CULTURE) && !m_cultureOrLanguage.IsEmpty())
-            {
-                m_szCultureOrLanguageUTF8 = m_cultureOrLanguage.GetUTF8(sCultureBuffer);
-            }
-        }
-
-        inline LPCSTR GetSimpleNameUTF8()
-        {
-            return m_szSimpleNameUTF8;
-        }
-
-        inline LPCSTR GetCultureOrLanguageUTF8()
-        {
-            return m_szCultureOrLanguageUTF8;
-        }
-
-        inline const BYTE *GetPublicKeyOrTokenArray()
-        {
-            const BYTE *pPublicKeyOrToken = m_publicKeyOrTokenBLOB;
-
-            return pPublicKeyOrToken;
-        }
-
-    protected:
-        StackScratchBuffer sSimpleNameBuffer;
-        StackScratchBuffer sCultureBuffer;
-        LPCSTR m_szSimpleNameUTF8;
-        LPCSTR m_szCultureOrLanguageUTF8;
-    };
 };
 
 #endif