Implement DiagnosticName in NativeAOT code (#63271)

When `DiagnosticName` was introduced into the type system, I didn't want to deal with it and compiled it out of the NativeAOT version of the type system. In order to have a single ILCompiler.TypeSystem assembly that can be used with both crossgen2 and ILC, this needs to be implemented. I've also reduced the number of diffs between ILCompiler.TypeSystem.csproj and ILCompiler.TypeSystem.ReadyToRun.csproj.
dotnet · Jan 3, 2022 · 699b0ae · 699b0ae
1 parent c8f3b36
commit 699b0ae
Show file tree

Hide file tree

Showing 23 changed files with 323 additions and 37 deletions.
diff --git a/src/coreclr/tools/Common/TypeSystem/Common/GenericParameterDesc.Diagnostic.cs b/src/coreclr/tools/Common/TypeSystem/Common/GenericParameterDesc.Diagnostic.cs
@@ -11,6 +11,12 @@ public abstract partial class GenericParameterDesc
         /// <summary>
         /// Gets the name of the generic parameter as defined in the metadata. This must not throw
         /// </summary>
-        public abstract string DiagnosticName { get; }
+        public virtual string DiagnosticName
+        {
+            get
+            {
+                return string.Concat("T", Index.ToStringInvariant());
+            }
+        }
     }
 }
diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/AssemblyGetExecutingAssemblyMethodThunk.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/AssemblyGetExecutingAssemblyMethodThunk.cs
@@ -44,6 +44,14 @@ public override string Name
             }
         }
 
+        public override string DiagnosticName
+        {
+            get
+            {
+                return $"GetExecutingAssembly_{ExecutingAssembly.GetName().Name}";
+            }
+        }
+
         public override TypeDesc OwningType
         {
             get;

diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/CalliMarshallingMethodThunk.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/CalliMarshallingMethodThunk.cs
@@ -79,6 +79,14 @@ public override string Name
             }
         }
 
+        public override string DiagnosticName
+        {
+            get
+            {
+                return "CalliMarshallingMethodThunk";
+            }
+        }
+
         public override PInvokeMetadata GetPInvokeMethodMetadata()
         {
             // Return PInvokeAttributes.PreserveSig to circumvent marshalling required checks

diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/DelegateMarshallingMethodThunk.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/DelegateMarshallingMethodThunk.cs
@@ -237,6 +237,14 @@ public override string Name
             }
         }
 
+        public override string DiagnosticName
+        {
+            get
+            {
+                return NamePrefix + "__" + DelegateType.DiagnosticName;
+            }
+        }
+
         public override MethodIL EmitIL()
         {
             return PInvokeILEmitter.EmitIL(this, default(PInvokeILEmitterConfiguration), _interopStateManager);

diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/DelegateThunks.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/DelegateThunks.cs
@@ -90,6 +90,14 @@ protected FieldDesc FunctionPointerField
                 return SystemDelegateType.GetKnownField("m_functionPointer");
             }
         }
+
+        public sealed override string DiagnosticName
+        {
+            get
+            {
+                return Name;
+            }
+        }
     }
 
     /// <summary>
@@ -779,5 +787,13 @@ public override string Name
                 return "GetThunk";
             }
         }
+
+        public override string DiagnosticName
+        {
+            get
+            {
+                return "GetThunk";
+            }
+        }
     }
 }
diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/DynamicInvokeMethodThunk.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/DynamicInvokeMethodThunk.cs
@@ -308,6 +308,14 @@ public override string Name
             }
         }
 
+        public override string DiagnosticName
+        {
+            get
+            {
+                return Name;
+            }
+        }
+
         public override MethodIL EmitIL()
         {
             ILEmitter emitter = new ILEmitter();

diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/EnumThunks.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/EnumThunks.cs
@@ -64,6 +64,14 @@ public override string Name
             }
         }
 
+        public override string DiagnosticName
+        {
+            get
+            {
+                return "GetHashCode";
+            }
+        }
+
         public override bool IsVirtual
         {
             get
@@ -147,6 +155,14 @@ public override string Name
             }
         }
 
+        public override string DiagnosticName
+        {
+            get
+            {
+                return "Equals";
+            }
+        }
+
         public override bool IsVirtual
         {
             get

diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/ForwardDelegateCreationThunk.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/ForwardDelegateCreationThunk.cs
@@ -75,6 +75,14 @@ public override string Name
             }
         }
 
+        public override string DiagnosticName
+        {
+            get
+            {
+                return "ForwardDelegateCreationStub__" + DelegateType.DiagnosticName;
+            }
+        }
+
         /// <summary>
         /// This thunk creates a delegate from a native function pointer
         /// by first creating a PInvokeDelegateWrapper from the function pointer

diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/MethodBaseGetCurrentMethodThunk.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/MethodBaseGetCurrentMethodThunk.cs
@@ -44,6 +44,14 @@ public override string Name
             }
         }
 
+        public override string DiagnosticName
+        {
+            get
+            {
+                return Method.DiagnosticName;
+            }
+        }
+
         public override TypeDesc OwningType
         {
             get

diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/StructMarshallingThunk.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/StructMarshallingThunk.cs
@@ -126,6 +126,14 @@ public override string Name
             }
         }
 
+        public override string DiagnosticName
+        {
+            get
+            {
+                return NamePrefix + "__" + ManagedType.DiagnosticName;
+            }
+        }
+
         private Marshaller[] InitializeMarshallers()
         {
             Debug.Assert(_interopStateManager != null);

diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/TypeGetTypeMethodThunk.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/TypeGetTypeMethodThunk.cs
@@ -41,6 +41,14 @@ public override string Name
             }
         }
 
+        public override string DiagnosticName
+        {
+            get
+            {
+                return $"{_helperMethod.DiagnosticName}_{Signature.Length}_{DefaultAssemblyName}";
+            }
+        }
+
         public override TypeDesc OwningType
         {
             get;

diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/ValueTypeGetFieldHelperMethodOverride.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/ValueTypeGetFieldHelperMethodOverride.cs
@@ -149,5 +149,13 @@ public override string Name
                 return "__GetFieldHelper";
             }
         }
+
+        public override string DiagnosticName
+        {
+            get
+            {
+                return "__GetFieldHelper";
+            }
+        }
     }
 }
diff --git a/src/coreclr/tools/Common/TypeSystem/IL/TypeSystemContext.GeneratedAssembly.cs b/src/coreclr/tools/Common/TypeSystem/IL/TypeSystemContext.GeneratedAssembly.cs
@@ -89,6 +89,14 @@ public override string Name
                 get;
             }
 
+            public override string DiagnosticName
+            {
+                get
+                {
+                    return Name;
+                }
+            }
+
             public override string Namespace
             {
                 get
@@ -97,6 +105,14 @@ public override string Namespace
                 }
             }
 
+            public override string DiagnosticNamespace
+            {
+                get
+                {
+                    return "Internal.CompilerGenerated";
+                }
+            }
+
             public override int GetHashCode()
             {
                 if (_hashcode != 0)

diff --git a/src/coreclr/tools/Common/TypeSystem/Interop/IL/InlineArrayType.cs b/src/coreclr/tools/Common/TypeSystem/Interop/IL/InlineArrayType.cs
@@ -35,6 +35,14 @@ public override string Name
             }
         }
 
+        public override string DiagnosticName
+        {
+            get
+            {
+                return "_InlineArray__" + ElementType.DiagnosticName + "__" + Length;
+            }
+        }
+
         public override string Namespace
         {
             get
@@ -43,6 +51,14 @@ public override string Namespace
             }
         }
 
+        public override string DiagnosticNamespace
+        {
+            get
+            {
+                return Namespace;
+            }
+        }
+
         public override Instantiation Instantiation
         {
             get
@@ -320,6 +336,14 @@ public override string Name
                 }
             }
 
+            public override string DiagnosticName
+            {
+                get
+                {
+                    return Name;
+                }
+            }
+
             public override MethodSignature Signature
             {
                 get

diff --git a/src/coreclr/tools/Common/TypeSystem/Interop/IL/NativeStructType.cs b/src/coreclr/tools/Common/TypeSystem/Interop/IL/NativeStructType.cs
@@ -28,6 +28,14 @@ public override string Name
             }
         }
 
+        public override string DiagnosticName
+        {
+            get
+            {
+                return "__NativeType__" + ManagedStructType.DiagnosticName;
+            }
+        }
+
         public override string Namespace
         {
             get
@@ -36,6 +44,14 @@ public override string Namespace
             }
         }
 
+        public override string DiagnosticNamespace
+        {
+            get
+            {
+                return "Internal.CompilerGenerated";
+            }
+        }
+
         public override PInvokeStringFormat PInvokeStringFormat
         {
             get

diff --git a/src/coreclr/tools/Common/TypeSystem/Interop/IL/PInvokeDelegateWrapper.cs b/src/coreclr/tools/Common/TypeSystem/Interop/IL/PInvokeDelegateWrapper.cs
@@ -35,6 +35,14 @@ public override string Name
             }
         }
 
+        public override string DiagnosticName
+        {
+            get
+            {
+                return "PInvokeDelegateWrapper__" + DelegateType.DiagnosticName;
+            }
+        }
+
         public override string Namespace
         {
             get
@@ -43,6 +51,14 @@ public override string Namespace
             }
         }
 
+        public override string DiagnosticNamespace
+        {
+            get
+            {
+                return "Internal.CompilerGenerated";
+            }
+        }
+
         public override bool IsExplicitLayout
         {
             get

diff --git a/src/coreclr/tools/Common/TypeSystem/Interop/IL/PInvokeDelegateWrapperConstructor.cs b/src/coreclr/tools/Common/TypeSystem/Interop/IL/PInvokeDelegateWrapperConstructor.cs
@@ -33,6 +33,14 @@ public override string Name
             }
         }
 
+        public override string DiagnosticName
+        {
+            get
+            {
+                return ".ctor";
+            }
+        }
+
         private MethodSignature _signature;
         public override MethodSignature Signature
         {