integrate with System.Private.CoreLib for Mono and clr tools, improve…

… perf

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

@@ -37,12 +37,18 @@ internal partial struct TypeNameParser
         public static TypeDesc ResolveType(ModuleDesc module, string name, bool throwIfNotFound,
             Func<ModuleDesc, string, MetadataType> canonResolver)
         {
-            return new TypeNameParser(name.AsSpan())
+            var parsed = Metadata.TypeNameParser.Parse(name.AsSpan(), throwOnError: false);
+            if (parsed is null)
+            {
+                ThrowHelper.ThrowTypeLoadException(name, module);
+            }
+
+            return new TypeNameParser()
             {
                 _module = module,
                 _throwIfNotFound = throwIfNotFound,
                 _canonResolver = canonResolver
-            }.Parse()?.Value;
+            }.Resolve(parsed)?.Value;
         }
 
         private sealed class Type
@@ -64,12 +70,10 @@ public Type MakeGenericType(Type[] typeArguments)
             }
         }
 
-        private static bool CheckTopLevelAssemblyQualifiedName() => true;
-
-        private Type GetType(string typeName, ReadOnlySpan<string> nestedTypeNames, string assemblyNameIfAny)
+        private Type GetType(string typeName, ReadOnlySpan<string> nestedTypeNames, AssemblyName assemblyNameIfAny)
         {
             ModuleDesc module = (assemblyNameIfAny == null) ? _module :
-                _module.Context.ResolveAssembly(new AssemblyName(assemblyNameIfAny), throwIfNotFound: _throwIfNotFound);
+                _module.Context.ResolveAssembly(assemblyNameIfAny, throwIfNotFound: _throwIfNotFound);
 
             if (_canonResolver != null && nestedTypeNames.IsEmpty)
             {
@@ -115,10 +119,5 @@ private static Type GetTypeCore(ModuleDesc module, string typeName, ReadOnlySpan
 
             return new Type(type);
         }
-
-        private void ParseError()
-        {
-            ThrowHelper.ThrowTypeLoadException(_input.ToString(), _module);
-        }
     }
 }

src/coreclr/tools/ILVerification/ILVerification.projitems

@@ -66,9 +66,24 @@
     <Compile Include="$(ToolsCommonPath)TypeSystem\Common\Utilities\CustomAttributeTypeNameParser.cs">
       <Link>Utilities\CustomAttributeTypeNameParser.cs</Link>
     </Compile>
-    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\TypeNameParser.cs">
+    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\HexConverter.cs">
+      <Link>Utilities\HexConverter.cs</Link>
+    </Compile>
+    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\AssemblyNameParser.cs">
+      <Link>Utilities\AssemblyNameParser.cs</Link>
+    </Compile>
+    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\Metadata\TypeName.cs">
+      <Link>Utilities\TypeName.cs</Link>
+    </Compile>
+    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\Metadata\TypeNameParserOptions.cs">
+      <Link>Utilities\TypeNameParserOptions.cs</Link>
+    </Compile>
+    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\Metadata\TypeNameParser.cs">
       <Link>Utilities\TypeNameParser.cs</Link>
     </Compile>
+    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\TypeNameParser.Helpers.cs">
+      <Link>Utilities\CustomAttributeTypeNameParser.Helpers</Link>
+    </Compile>
     <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Text\ValueStringBuilder.cs">
       <Link>Utilities\ValueStringBuilder.cs</Link>
     </Compile>

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/TypeNameParser.Dataflow.cs

@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
-
 using Internal.TypeSystem;
 
 namespace System.Reflection
@@ -20,14 +16,21 @@ internal partial struct TypeNameParser
         public static TypeDesc ResolveType(string name, ModuleDesc callingModule,
             TypeSystemContext context, List<ModuleDesc> referencedModules, out bool typeWasNotFoundInAssemblyNorBaseLibrary)
         {
-            var parser = new TypeNameParser(name)
+            var parsed = Metadata.TypeNameParser.Parse(name, throwOnError: false);
+            if (parsed is null) // TODO adsitnik: verify that this is desired
+            {
+                typeWasNotFoundInAssemblyNorBaseLibrary = true;
+                return null;
+            }
+
+            var parser = new TypeNameParser()
             {
                 _context = context,
                 _callingModule = callingModule,
                 _referencedModules = referencedModules
             };
 
-            TypeDesc result = parser.Parse()?.Value;
+            TypeDesc result = parser.Resolve(parsed)?.Value;
 
             typeWasNotFoundInAssemblyNorBaseLibrary = parser._typeWasNotFoundInAssemblyNorBaseLibrary;
             return result;
@@ -52,16 +55,13 @@ public Type MakeGenericType(Type[] typeArguments)
             }
         }
 
-        private static bool CheckTopLevelAssemblyQualifiedName() => true;
-
-        private Type GetType(string typeName, ReadOnlySpan<string> nestedTypeNames, string assemblyNameIfAny)
+        private Type GetType(string typeName, ReadOnlySpan<string> nestedTypeNames, AssemblyName assemblyNameIfAny)
         {
             ModuleDesc module;
 
             if (assemblyNameIfAny != null)
             {
-                module = (TryParseAssemblyName(assemblyNameIfAny) is AssemblyName an) ?
-                    _context.ResolveAssembly(an, throwIfNotFound: false) : null;
+                module = _context.ResolveAssembly(assemblyNameIfAny, throwIfNotFound: false);
             }
             else
             {
@@ -94,22 +94,6 @@ private Type GetType(string typeName, ReadOnlySpan<string> nestedTypeNames, stri
             return null;
         }
 
-        private static AssemblyName TryParseAssemblyName(string assemblyName)
-        {
-            try
-            {
-                return new AssemblyName(assemblyName);
-            }
-            catch (FileLoadException)
-            {
-                return null;
-            }
-            catch (ArgumentException)
-            {
-                return null;
-            }
-        }
-
         private static Type GetTypeCore(ModuleDesc module, string typeName, ReadOnlySpan<string> nestedTypeNames)
         {
             (string typeNamespace, string name) = SplitFullTypeName(typeName);
@@ -127,9 +111,5 @@ private static Type GetTypeCore(ModuleDesc module, string typeName, ReadOnlySpan
 
             return new Type(type);
         }
-
-        private static void ParseError()
-        {
-        }
     }
 }

src/coreclr/tools/aot/ILCompiler.Compiler/ILCompiler.Compiler.csproj

@@ -399,8 +399,8 @@
     <Compile Include="Compiler\Dataflow\TrimAnalysisPatternStore.cs" />
     <Compile Include="Compiler\Dataflow\TrimAnalysisTokenAccessPattern.cs" />
     <Compile Include="Compiler\Dataflow\TypeNameParser.Dataflow.cs" />
-    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\TypeNameParser.cs">
-      <Link>Compiler\Dataflow\TypeNameParser.cs</Link>
+    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\TypeNameParser.Helpers.cs">
+      <Link>Compiler\Dataflow\TypeNameParser.Helpers.cs</Link>
     </Compile>
     <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Text\ValueStringBuilder.cs">
       <Link>Utilities\ValueStringBuilder.cs</Link>

src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj

@@ -184,9 +184,24 @@
     <Compile Include="..\..\Common\TypeSystem\Common\Utilities\CustomAttributeTypeNameParser.cs">
       <Link>Utilities\CustomAttributeTypeNameParser.cs</Link>
     </Compile>
-    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\TypeNameParser.cs">
+    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\HexConverter.cs">
+      <Link>Utilities\HexConverter.cs</Link>
+    </Compile>
+    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\AssemblyNameParser.cs">
+      <Link>Utilities\AssemblyNameParser.cs</Link>
+    </Compile>
+    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\Metadata\TypeName.cs">
+      <Link>Utilities\TypeName.cs</Link>
+    </Compile>
+    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\Metadata\TypeNameParserOptions.cs">
+      <Link>Utilities\TypeNameParserOptions.cs</Link>
+    </Compile>
+    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\Metadata\TypeNameParser.cs">
       <Link>Utilities\TypeNameParser.cs</Link>
     </Compile>
+    <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\TypeNameParser.Helpers.cs">
+      <Link>Utilities\CustomAttributeTypeNameParser.Helpers</Link>
+    </Compile>
     <Compile Include="$(LibrariesProjectRoot)\Common\src\System\Text\ValueStringBuilder.cs">
       <Link>Utilities\ValueStringBuilder.cs</Link>
     </Compile>

src/libraries/Common/src/System/Reflection/AssemblyNameParser.cs

@@ -8,6 +8,8 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 
+#nullable enable
+
 namespace System.Reflection
 {
     //

src/libraries/Common/src/System/Reflection/Metadata/TypeName.cs

@@ -3,6 +3,8 @@
 
 using System.Diagnostics.CodeAnalysis;
 
+#nullable enable
+
 namespace System.Reflection.Metadata
 {
 #if SYSTEM_PRIVATE_CORELIB
@@ -20,6 +22,7 @@ sealed class TypeName
         // Negative value is modifier encoded using constants above.
         private readonly int _rankOrModifier;
         private readonly TypeName[]? _genericArguments;
+        private string? _assemblyQualifiedName;
 
         internal TypeName(string name, AssemblyName? assemblyName, int rankOrModifier,
             TypeName? underlyingType = default,
@@ -32,7 +35,6 @@ internal TypeName(string name, AssemblyName? assemblyName, int rankOrModifier,
             UnderlyingType = underlyingType;
             ContainingType = containingType;
             _genericArguments = genericTypeArguments;
-            AssemblyQualifiedName = assemblyName is null ? name : $"{name}, {assemblyName.FullName}";
         }
 
         /// <summary>
@@ -41,7 +43,8 @@ internal TypeName(string name, AssemblyName? assemblyName, int rankOrModifier,
         /// <remarks>
         /// If <see cref="AssemblyName"/> is null, simply returns <see cref="Name"/>.
         /// </remarks>
-        public string AssemblyQualifiedName { get; }
+        public string AssemblyQualifiedName
+            => _assemblyQualifiedName ??= AssemblyName is null ? Name : $"{Name}, {AssemblyName.FullName}";
 
         /// <summary>
         /// The assembly which contains this type, or null if this <see cref="TypeName"/> was not

src/libraries/Common/src/System/Reflection/Metadata/TypeNameParser.cs

@@ -9,6 +9,8 @@
 using System.Diagnostics;
 using System.Text;
 
+#nullable enable
+
 namespace System.Reflection.Metadata
 {
 #if SYSTEM_PRIVATE_CORELIB
@@ -22,6 +24,7 @@ ref struct TypeNameParser
 #if NET8_0_OR_GREATER
         private static readonly SearchValues<char> _endOfTypeNameDelimitersSearchValues = SearchValues.Create(EndOfTypeNameDelimiters);
 #endif
+        private static readonly TypeNameParserOptions _defaults = new();
         private readonly bool _throwOnError;
         private readonly TypeNameParserOptions _parseOptions;
         private ReadOnlySpan<char> _inputString;
@@ -30,7 +33,7 @@ private TypeNameParser(ReadOnlySpan<char> name, bool throwOnError, TypeNameParse
         {
             _inputString = name;
             _throwOnError = throwOnError;
-            _parseOptions = options ?? new();
+            _parseOptions = options ?? _defaults;
         }
 
         public static TypeName? Parse(ReadOnlySpan<char> typeName, bool allowFullyQualifiedName = true, bool throwOnError = true, TypeNameParserOptions? options = default)
@@ -314,8 +317,13 @@ private bool TryParseAssemblyName(ref AssemblyName? assemblyName)
                     return false;
                 }
 
+#if SYSTEM_PRIVATE_CORELIB
+                assemblyName = new();
+                assemblyName.Init(parts);
+#else
                 // TODO: fix the perf and avoid doing it twice (missing public ctors for System.Reflection.Metadata)
                 assemblyName = new(candidate.ToString());
+#endif
                 _inputString = _inputString.Slice(assemblyNameLength);
                 return true;
             }

src/libraries/Common/src/System/Reflection/TypeNameParser.Helpers.cs

@@ -54,6 +54,28 @@ private static string EscapeTypeName(string typeName, ReadOnlySpan<string> neste
             return fullName;
         }
 
+        private static (string typeNamespace, string name) SplitFullTypeName(string typeName)
+        {
+            string typeNamespace, name;
+
+            // Matches algorithm from ns::FindSep in src\coreclr\utilcode\namespaceutil.cpp
+            int separator = typeName.LastIndexOf('.');
+            if (separator <= 0)
+            {
+                typeNamespace = "";
+                name = typeName;
+            }
+            else
+            {
+                if (typeName[separator - 1] == '.')
+                    separator--;
+                typeNamespace = typeName.Substring(0, separator);
+                name = typeName.Substring(separator + 1);
+            }
+
+            return (typeNamespace, name);
+        }
+
         private Type? Resolve(Metadata.TypeName typeName)
         {
             if (typeName.IsNestedType)
@@ -88,8 +110,10 @@ private static string EscapeTypeName(string typeName, ReadOnlySpan<string> neste
             return Make(Resolve(typeName.UnderlyingType), typeName);
         }
 
+#if !NETSTANDARD2_0 // needed for ILVerification project
         [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2055:UnrecognizedReflectionPattern",
             Justification = "Used to implement resolving types from strings.")]
+#endif
         private Type? Make(Type? type, Metadata.TypeName typeName)
         {
             if (type is null || typeName.IsElementalType)