Switch AOT compilers to use AssemblyNameInfo

Author: jkotas

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/General/MetadataReaderExtensions.cs

@@ -120,13 +120,10 @@ private static RuntimeAssemblyName CreateRuntimeAssemblyNameFromMetadata(
             ByteCollection publicKeyOrToken,
             global::Internal.Metadata.NativeFormat.AssemblyFlags assemblyFlags)
         {
-            AssemblyNameFlags assemblyNameFlags = AssemblyNameFlags.None;
-            if (0 != (assemblyFlags & global::Internal.Metadata.NativeFormat.AssemblyFlags.PublicKey))
-                assemblyNameFlags |= AssemblyNameFlags.PublicKey;
-            if (0 != (assemblyFlags & global::Internal.Metadata.NativeFormat.AssemblyFlags.Retargetable))
-                assemblyNameFlags |= AssemblyNameFlags.Retargetable;
-            int contentType = ((int)assemblyFlags) & 0x00000E00;
-            assemblyNameFlags |= (AssemblyNameFlags)contentType;
+            AssemblyNameFlags assemblyNameFlags = (AssemblyNameFlags)(assemblyFlags & (
+                global::Internal.Metadata.NativeFormat.AssemblyFlags.PublicKey |
+                global::Internal.Metadata.NativeFormat.AssemblyFlags.Retargetable |
+                global::Internal.Metadata.NativeFormat.AssemblyFlags.ContentTypeMask));
 
             ArrayBuilder<byte> keyOrTokenArrayBuilder = default;
             foreach (byte b in publicKeyOrToken)

src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/TypeSystem/AssemblyNameInfo.Dummy.cs

@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Internal.TypeSystem
+{
+    // Dummy implementation of AssemlyNameInfo for runtime type system
+    public abstract class AssemblyNameInfo
+    {
+        public abstract string FullName { get; }
+    }
+}

src/coreclr/nativeaot/System.Private.TypeLoader/src/System.Private.TypeLoader.csproj

@@ -255,6 +255,7 @@
     <Compile Include="Internal\Runtime\TypeLoader\TypeSystemContextFactory.cs" />
     <Compile Include="Internal\Runtime\TypeLoader\TypeSystemExtensions.cs" />
     <Compile Include="Internal\Runtime\TypeLoader\WellKnownTypeExtensions.cs" />
+    <Compile Include="Internal\TypeSystem\AssemblyNameInfo.Dummy.cs" />
     <Compile Include="Internal\TypeSystem\ArrayMethod.Runtime.cs" />
     <Compile Include="Internal\TypeSystem\CanonTypes.Runtime.cs" />
     <Compile Include="Internal\TypeSystem\DefType.Runtime.cs" />

src/coreclr/tools/Common/Compiler/CompilerTypeSystemContext.cs

@@ -98,7 +98,7 @@ public IReadOnlyDictionary<string, string> ReferenceFilePaths
             set;
         }
 
-        public override ModuleDesc ResolveAssembly(System.Reflection.AssemblyName name, bool throwIfNotFound)
+        public override ModuleDesc ResolveAssembly(AssemblyNameInfo name, bool throwIfNotFound)
         {
             // TODO: catch typesystem BadImageFormatException and throw a new one that also captures the
             // assembly name that caused the failure. (Along with the reason, which makes this rather annoying).

src/coreclr/tools/Common/Compiler/ProcessLinkerXmlBase.cs

@@ -128,7 +128,7 @@ protected virtual void ProcessXml(bool ignoreResource)
 
         protected virtual AllowedAssemblies AllowedAssemblySelector { get => _owningModule != null ? AllowedAssemblies.ContainingAssembly : AllowedAssemblies.AnyAssembly; }
 
-        private bool ShouldProcessAllAssemblies(XPathNavigator nav, [NotNullWhen(false)] out AssemblyName? assemblyName)
+        private bool ShouldProcessAllAssemblies(XPathNavigator nav, [NotNullWhen(false)] out AssemblyNameInfo? assemblyName)
         {
             assemblyName = null;
             if (GetFullName(nav) == AllAssembliesFullName)
@@ -147,7 +147,7 @@ protected virtual void ProcessAssemblies(XPathNavigator nav)
 
                 // Errors for invalid assembly names should show up even if this element will be
                 // skipped due to feature conditions.
-                bool processAllAssemblies = ShouldProcessAllAssemblies(assemblyNav, out AssemblyName? name);
+                bool processAllAssemblies = ShouldProcessAllAssemblies(assemblyNav, out AssemblyNameInfo? name);
                 if (processAllAssemblies && !_globalAttributeRemoval)
                 {
 #if !READYTORUN
@@ -175,7 +175,7 @@ protected virtual void ProcessAssemblies(XPathNavigator nav)
                         if (_owningModule.Assembly.GetName().Name != name!.Name)
                         {
 #if !READYTORUN
-                            LogWarning(assemblyNav, DiagnosticId.AssemblyWithEmbeddedXmlApplyToAnotherAssembly, _owningModule.Assembly.GetName().Name ?? "", name.ToString());
+                            LogWarning(assemblyNav, DiagnosticId.AssemblyWithEmbeddedXmlApplyToAnotherAssembly, _owningModule.Assembly.GetName().Name, name.FullName);
 #endif
                             continue;
                         }
@@ -188,7 +188,7 @@ protected virtual void ProcessAssemblies(XPathNavigator nav)
                     if (assembly == null)
                     {
 #if !READYTORUN
-                        LogWarning(assemblyNav, DiagnosticId.XmlCouldNotResolveAssembly, name!.Name ?? "");
+                        LogWarning(assemblyNav, DiagnosticId.XmlCouldNotResolveAssembly, name!.Name);
 #endif
                         continue;
                     }
@@ -499,9 +499,9 @@ protected virtual void ProcessProperty(TypeDesc type, XPathNavigator nav, object
 
         protected virtual void ProcessProperty(TypeDesc type, PropertyPseudoDesc property, XPathNavigator nav, object? customData, bool fromSignature) { }
 
-        protected virtual AssemblyName GetAssemblyName(XPathNavigator nav)
+        protected virtual AssemblyNameInfo GetAssemblyName(XPathNavigator nav)
         {
-            return new AssemblyName(GetFullName(nav));
+            return AssemblyNameInfo.Parse(GetFullName(nav));
         }
 
         protected static string GetFullName(XPathNavigator nav)

src/coreclr/tools/Common/Internal/Metadata/NativeFormat/NativeFormatReaderCommonGen.cs

@@ -14,6 +14,7 @@
 
 namespace Internal.Metadata.NativeFormat
 {
+    // Internal clone of System.Reflection.AssemblyFlags from System.Reflection.Metadata
     [Flags]
 #if SYSTEM_PRIVATE_CORELIB
     [CLSCompliant(false)]
@@ -26,13 +27,12 @@ public enum AssemblyFlags : uint
         /// The implementation of this assembly used at runtime is not expected to match the version seen at compile time.
         Retargetable = 0x100,
 
-        /// Reserved.
-        DisableJITcompileOptimizer = 0x4000,
+        /// Content type mask. Masked bits correspond to values of System.Reflection.AssemblyContentType
+        ContentTypeMask = 0x00000e00,
 
-        /// Reserved.
-        EnableJITcompileTracking = 0x8000,
     } // AssemblyFlags
 
+    // Internal clone of System.Reflection.AssemblyHashAlgorithm from System.Reflection.Metadata
 #if SYSTEM_PRIVATE_CORELIB
     [CLSCompliant(false)]
 #endif

src/coreclr/tools/Common/TypeSystem/Common/IAssemblyDesc.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Reflection;
+using System.Reflection.Metadata;
 
 namespace Internal.TypeSystem
 {
@@ -13,6 +13,6 @@ public interface IAssemblyDesc
         /// <summary>
         /// Gets the assembly name.
         /// </summary>
-        AssemblyName GetName();
+        AssemblyNameInfo GetName();
     }
 }

src/coreclr/tools/Common/TypeSystem/Common/IModuleResolver.cs

@@ -1,13 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Reflection;
+using System.Reflection.Metadata;
 
 namespace Internal.TypeSystem
 {
     public interface IModuleResolver
     {
-        ModuleDesc ResolveAssembly(AssemblyName name, bool throwIfNotFound = true);
+        ModuleDesc ResolveAssembly(AssemblyNameInfo name, bool throwIfNotFound = true);
         ModuleDesc ResolveModule(IAssemblyDesc referencingModule, string fileName, bool throwIfNotFound = true);
     }
 }

src/coreclr/tools/Common/TypeSystem/Common/TypeSystemContext.Resolution.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Reflection;
+using System.Reflection.Metadata;
 
 using Internal.NativeFormat;
 
@@ -24,7 +24,7 @@ protected void InitializeSystemModule(ModuleDesc systemModule)
             SystemModule = systemModule;
         }
 
-        public virtual ModuleDesc ResolveAssembly(AssemblyName name, bool throwIfNotFound = true)
+        public virtual ModuleDesc ResolveAssembly(AssemblyNameInfo name, bool throwIfNotFound = true)
         {
             if (throwIfNotFound)
                 throw new NotSupportedException();

src/coreclr/tools/Common/TypeSystem/Common/Utilities/CustomAttributeTypeNameParser.cs

@@ -109,7 +109,7 @@ private TypeDesc GetSimpleType(TypeName typeName)
                 ModuleDesc module = _module;
                 if (topLevelTypeName.AssemblyName != null)
                 {
-                    module = _context.ResolveAssembly(typeName.AssemblyName.ToAssemblyName(), throwIfNotFound: _throwIfNotFound);
+                    module = _context.ResolveAssembly(typeName.AssemblyName, throwIfNotFound: _throwIfNotFound);
                     if (module == null)
                         return null;
                 }