Implement DiagnosticName in NativeAOT code (#63271)

MichalStrehovsky · web-flow · commit 699b0ae0593e · 2022-01-03T15:03:03.000+09:00
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.
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
         {
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/CompilerTypeSystemContext.BoxedTypes.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/CompilerTypeSystemContext.BoxedTypes.cs
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/CompilerTypeSystemContext.IntefaceThunks.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/CompilerTypeSystemContext.IntefaceThunks.cs
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/IL/Stubs/StartupCode/AppContextInitializerMethod.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/IL/Stubs/StartupCode/AppContextInitializerMethod.cs
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/IL/Stubs/StartupCode/NativeLibraryStartupMethod.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/IL/Stubs/StartupCode/NativeLibraryStartupMethod.cs
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/IL/Stubs/StartupCode/StartupCodeMainMethod.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/IL/Stubs/StartupCode/StartupCodeMainMethod.cs
diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj b/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,12 @@ public abstract partial class GenericParameterDesc`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// Gets the name of the generic parameter as defined in the metadata. This must not throw`
`13`	`13`	`/// </summary>`
`14`		`- public abstract string DiagnosticName { get; }`
	`14`	`+ public virtual string DiagnosticName`
	`15`	`+ {`
	`16`	`+ get`
	`17`	`+ {`
	`18`	`+ return string.Concat("T", Index.ToStringInvariant());`
	`19`	`+ }`
	`20`	`+ }`
`15`	`21`	`}`
`16`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,14 @@ public override string Name`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
	`47`	`+ public override string DiagnosticName`
	`48`	`+ {`
	`49`	`+ get`
	`50`	`+ {`
	`51`	`+ return $"GetExecutingAssembly_{ExecutingAssembly.GetName().Name}";`
	`52`	`+ }`
	`53`	`+ }`
	`54`	`+`
`47`	`55`	`public override TypeDesc OwningType`
`48`	`56`	`{`
`49`	`57`	`get;`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,14 @@ public override string Name`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
	`82`	`+ public override string DiagnosticName`
	`83`	`+ {`
	`84`	`+ get`
	`85`	`+ {`
	`86`	`+ return "CalliMarshallingMethodThunk";`
	`87`	`+ }`
	`88`	`+ }`
	`89`	`+`
`82`	`90`	`public override PInvokeMetadata GetPInvokeMethodMetadata()`
`83`	`91`	`{`
`84`	`92`	`// Return PInvokeAttributes.PreserveSig to circumvent marshalling required checks`
Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,14 @@ public override string Name`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`
	`240`	`+ public override string DiagnosticName`
	`241`	`+ {`
	`242`	`+ get`
	`243`	`+ {`
	`244`	`+ return NamePrefix + "__" + DelegateType.DiagnosticName;`
	`245`	`+ }`
	`246`	`+ }`
	`247`	`+`
`240`	`248`	`public override MethodIL EmitIL()`
`241`	`249`	`{`
`242`	`250`	`return PInvokeILEmitter.EmitIL(this, default(PInvokeILEmitterConfiguration), _interopStateManager);`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,14 @@ protected FieldDesc FunctionPointerField`
`90`	`90`	`return SystemDelegateType.GetKnownField("m_functionPointer");`
`91`	`91`	`}`
`92`	`92`	`}`
	`93`	`+`
	`94`	`+ public sealed override string DiagnosticName`
	`95`	`+ {`
	`96`	`+ get`
	`97`	`+ {`
	`98`	`+ return Name;`
	`99`	`+ }`
	`100`	`+ }`
`93`	`101`	`}`
`94`	`102`
`95`	`103`	`/// <summary>`
`@@ -779,5 +787,13 @@ public override string Name`
`779`	`787`	`return "GetThunk";`
`780`	`788`	`}`
`781`	`789`	`}`
	`790`	`+`
	`791`	`+ public override string DiagnosticName`
	`792`	`+ {`
	`793`	`+ get`
	`794`	`+ {`
	`795`	`+ return "GetThunk";`
	`796`	`+ }`
	`797`	`+ }`
`782`	`798`	`}`
`783`	`799`	`}`
Original file line number	Diff line number	Diff line change
`@@ -308,6 +308,14 @@ public override string Name`
`308`	`308`	`}`
`309`	`309`	`}`
`310`	`310`
	`311`	`+ public override string DiagnosticName`
	`312`	`+ {`
	`313`	`+ get`
	`314`	`+ {`
	`315`	`+ return Name;`
	`316`	`+ }`
	`317`	`+ }`
	`318`	`+`
`311`	`319`	`public override MethodIL EmitIL()`
`312`	`320`	`{`
`313`	`321`	`ILEmitter emitter = new ILEmitter();`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,14 @@ public override string Name`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ public override string DiagnosticName`
	`68`	`+ {`
	`69`	`+ get`
	`70`	`+ {`
	`71`	`+ return "GetHashCode";`
	`72`	`+ }`
	`73`	`+ }`
	`74`	`+`
`67`	`75`	`public override bool IsVirtual`
`68`	`76`	`{`
`69`	`77`	`get`
`@@ -147,6 +155,14 @@ public override string Name`
`147`	`155`	`}`
`148`	`156`	`}`
`149`	`157`
	`158`	`+ public override string DiagnosticName`
	`159`	`+ {`
	`160`	`+ get`
	`161`	`+ {`
	`162`	`+ return "Equals";`
	`163`	`+ }`
	`164`	`+ }`
	`165`	`+`
`150`	`166`	`public override bool IsVirtual`
`151`	`167`	`{`
`152`	`168`	`get`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,14 @@ public override string Name`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ public override string DiagnosticName`
	`79`	`+ {`
	`80`	`+ get`
	`81`	`+ {`
	`82`	`+ return "ForwardDelegateCreationStub__" + DelegateType.DiagnosticName;`
	`83`	`+ }`
	`84`	`+ }`
	`85`	`+`
`78`	`86`	`/// <summary>`
`79`	`87`	`/// This thunk creates a delegate from a native function pointer`
`80`	`88`	`/// by first creating a PInvokeDelegateWrapper from the function pointer`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,14 @@ public override string Name`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`
	`129`	`+ public override string DiagnosticName`
	`130`	`+ {`
	`131`	`+ get`
	`132`	`+ {`
	`133`	`+ return NamePrefix + "__" + ManagedType.DiagnosticName;`
	`134`	`+ }`
	`135`	`+ }`
	`136`	`+`
`129`	`137`	`private Marshaller[] InitializeMarshallers()`
`130`	`138`	`{`
`131`	`139`	`Debug.Assert(_interopStateManager != null);`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,14 @@ public override string Name`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ public override string DiagnosticName`
	`45`	`+ {`
	`46`	`+ get`
	`47`	`+ {`
	`48`	`+ return $"{_helperMethod.DiagnosticName}_{Signature.Length}_{DefaultAssemblyName}";`
	`49`	`+ }`
	`50`	`+ }`
	`51`	`+`
`44`	`52`	`public override TypeDesc OwningType`
`45`	`53`	`{`
`46`	`54`	`get;`