Delete more code around reflection blocking (#86139)

MichalStrehovsky · web-flow · commit a5d13e24cb37 · 2023-05-12T17:37:10.000+09:00
We had a bunch of code to carefully compute names in situations where the metadata/names might not be available. Such situations no longer exist.
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Reflection/Core/Execution/ExecutionDomain.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Reflection/Core/Execution/ExecutionDomain.cs
@@ -117,28 +117,19 @@ public Type GetNamedTypeForHandle(RuntimeTypeHandle typeHandle)
 
         public Type GetArrayTypeForHandle(RuntimeTypeHandle typeHandle)
         {
-            RuntimeTypeHandle elementTypeHandle;
-            if (!ExecutionEnvironment.TryGetArrayTypeElementType(typeHandle, out elementTypeHandle))
-                throw CreateMissingMetadataException((Type?)null);
-
+            RuntimeTypeHandle elementTypeHandle = ExecutionEnvironment.GetArrayTypeElementType(typeHandle);
             return elementTypeHandle.GetTypeForRuntimeTypeHandle().GetArrayType(typeHandle);
         }
 
         public Type GetMdArrayTypeForHandle(RuntimeTypeHandle typeHandle, int rank)
         {
-            RuntimeTypeHandle elementTypeHandle;
-            if (!ExecutionEnvironment.TryGetArrayTypeElementType(typeHandle, out elementTypeHandle))
-                throw CreateMissingMetadataException((Type?)null);
-
+            RuntimeTypeHandle elementTypeHandle = ExecutionEnvironment.GetArrayTypeElementType(typeHandle);
             return elementTypeHandle.GetTypeForRuntimeTypeHandle().GetMultiDimArrayType(rank, typeHandle);
         }
 
         public Type GetPointerTypeForHandle(RuntimeTypeHandle typeHandle)
         {
-            RuntimeTypeHandle targetTypeHandle;
-            if (!ExecutionEnvironment.TryGetPointerTypeTargetType(typeHandle, out targetTypeHandle))
-                throw CreateMissingMetadataException((Type?)null);
-
+            RuntimeTypeHandle targetTypeHandle = ExecutionEnvironment.GetPointerTypeTargetType(typeHandle);
             return targetTypeHandle.GetTypeForRuntimeTypeHandle().GetPointerType(typeHandle);
         }
 
@@ -161,10 +152,7 @@ public Type GetFunctionPointerTypeForHandle(RuntimeTypeHandle typeHandle)
 
         public Type GetByRefTypeForHandle(RuntimeTypeHandle typeHandle)
         {
-            RuntimeTypeHandle targetTypeHandle;
-            if (!ExecutionEnvironment.TryGetByRefTypeTargetType(typeHandle, out targetTypeHandle))
-                throw CreateMissingMetadataException((Type?)null);
-
+            RuntimeTypeHandle targetTypeHandle = ExecutionEnvironment.GetByRefTypeTargetType(typeHandle);
             return targetTypeHandle.GetTypeForRuntimeTypeHandle().GetByRefType(typeHandle);
         }
 
@@ -187,7 +175,7 @@ public Type GetConstructedGenericTypeForHandle(RuntimeTypeHandle typeHandle)
         //=======================================================================================
         // Missing metadata exceptions.
         //=======================================================================================
-        public Exception CreateMissingMetadataException(Type? pertainant)
+        public Exception CreateMissingMetadataException(Type pertainant)
         {
             return this.ReflectionDomainSetup.CreateMissingMetadataException(pertainant);
         }
@@ -197,16 +185,6 @@ public Exception CreateNonInvokabilityException(MemberInfo pertainant)
             return this.ReflectionDomainSetup.CreateNonInvokabilityException(pertainant);
         }
 
-        public Exception CreateMissingArrayTypeException(Type elementType, bool isMultiDim, int rank)
-        {
-            return ReflectionDomainSetup.CreateMissingArrayTypeException(elementType, isMultiDim, rank);
-        }
-
-        public Exception CreateMissingConstructedGenericTypeException(Type genericTypeDefinition, Type[] genericTypeArguments)
-        {
-            return ReflectionDomainSetup.CreateMissingConstructedGenericTypeException(genericTypeDefinition, genericTypeArguments);
-        }
-
         //=======================================================================================
         // Miscellaneous.
         //=======================================================================================
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Reflection/Core/Execution/ExecutionEnvironment.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Reflection/Core/Execution/ExecutionEnvironment.cs
@@ -46,7 +46,6 @@ public abstract class ExecutionEnvironment
         public abstract IEnumerable<RuntimeTypeHandle> TryGetImplementedInterfaces(RuntimeTypeHandle typeHandle);
         public abstract void VerifyInterfaceIsImplemented(RuntimeTypeHandle typeHandle, RuntimeTypeHandle ifaceHandle);
         public abstract void GetInterfaceMap(Type instanceType, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);
-        public abstract string GetLastResortString(RuntimeTypeHandle typeHandle);
 
         //==============================================================================================
         // Reflection Mapping Tables
@@ -55,18 +54,18 @@ public abstract class ExecutionEnvironment
         public abstract bool TryGetNamedTypeForMetadata(QTypeDefinition qTypeDefinition, out RuntimeTypeHandle runtimeTypeHandle);
 
         public abstract bool TryGetArrayTypeForElementType(RuntimeTypeHandle elementTypeHandle, out RuntimeTypeHandle arrayTypeHandle);
-        public abstract bool TryGetArrayTypeElementType(RuntimeTypeHandle arrayTypeHandle, out RuntimeTypeHandle elementTypeHandle);
+        public abstract RuntimeTypeHandle GetArrayTypeElementType(RuntimeTypeHandle arrayTypeHandle);
 
         public abstract bool TryGetMultiDimArrayTypeForElementType(RuntimeTypeHandle elementTypeHandle, int rank, out RuntimeTypeHandle arrayTypeHandle);
 
         public abstract bool TryGetFunctionPointerTypeForComponents(RuntimeTypeHandle returnTypeHandle, RuntimeTypeHandle[] parameterHandles, bool isUnmanaged, out RuntimeTypeHandle functionPointerTypeHandle);
         public abstract void GetFunctionPointerTypeComponents(RuntimeTypeHandle functionPointerHandle, out RuntimeTypeHandle returnTypeHandle, out RuntimeTypeHandle[] parameterHandles, out bool isUnmanaged);
 
         public abstract bool TryGetPointerTypeForTargetType(RuntimeTypeHandle targetTypeHandle, out RuntimeTypeHandle pointerTypeHandle);
-        public abstract bool TryGetPointerTypeTargetType(RuntimeTypeHandle pointerTypeHandle, out RuntimeTypeHandle targetTypeHandle);
+        public abstract RuntimeTypeHandle GetPointerTypeTargetType(RuntimeTypeHandle pointerTypeHandle);
 
         public abstract bool TryGetByRefTypeForTargetType(RuntimeTypeHandle targetTypeHandle, out RuntimeTypeHandle byRefTypeHandle);
-        public abstract bool TryGetByRefTypeTargetType(RuntimeTypeHandle byRefTypeHandle, out RuntimeTypeHandle targetTypeHandle);
+        public abstract RuntimeTypeHandle GetByRefTypeTargetType(RuntimeTypeHandle byRefTypeHandle);
 
         public abstract bool TryGetConstructedGenericTypeForComponents(RuntimeTypeHandle genericTypeDefinitionHandle, RuntimeTypeHandle[] genericTypeArgumentHandles, out RuntimeTypeHandle runtimeTypeHandle);
         public abstract bool TryGetConstructedGenericTypeForComponentsNoConstraintCheck(RuntimeTypeHandle genericTypeDefinitionHandle, RuntimeTypeHandle[] genericTypeArgumentHandles, out RuntimeTypeHandle runtimeTypeHandle);
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Reflection/Core/ReflectionDomainSetup.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Reflection/Core/ReflectionDomainSetup.cs
@@ -13,9 +13,7 @@ public abstract class ReflectionDomainSetup
     {
         protected ReflectionDomainSetup() { }
         public abstract AssemblyBinder AssemblyBinder { get; }
-        public abstract Exception CreateMissingMetadataException(Type? pertainant);
+        public abstract Exception CreateMissingMetadataException(Type pertainant);
         public abstract Exception CreateNonInvokabilityException(MemberInfo pertainant);
-        public abstract Exception CreateMissingArrayTypeException(Type elementType, bool isMultiDim, int rank);
-        public abstract Exception CreateMissingConstructedGenericTypeException(Type genericTypeDefinition, Type[] genericTypeArguments);
     }
 }
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/Augments/ReflectionExecutionDomainCallbacks.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/Augments/ReflectionExecutionDomainCallbacks.cs
@@ -41,7 +41,6 @@ public abstract class ReflectionExecutionDomainCallbacks
         // Flotsam and jetsam.
         public abstract Exception CreateMissingMetadataException(Type typeWithMissingMetadata);
 
-        public abstract string GetBetterDiagnosticInfoIfAvailable(RuntimeTypeHandle runtimeTypeHandle);
         public abstract MethodBase GetMethodBaseFromStartAddressIfAvailable(IntPtr methodStartAddress);
         public abstract Assembly GetAssemblyForHandle(RuntimeTypeHandle typeHandle);
 
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/Augments/RuntimeAugments.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/Augments/RuntimeAugments.cs
@@ -914,11 +914,6 @@ public static Delegate CreateObjectArrayDelegate(Type delegateType, Func<object?
             return Delegate.CreateObjectArrayDelegate(delegateType, invoker);
         }
 
-        public static string GetLastResortString(RuntimeTypeHandle typeHandle)
-        {
-            return typeHandle.LastResortToString;
-        }
-
         public static IntPtr RhHandleAlloc(object value, GCHandleType type)
         {
             return RuntimeImports.RhHandleAlloc(value, type);
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/CompilerHelpers/RuntimeInteropData.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/CompilerHelpers/RuntimeInteropData.cs
@@ -20,13 +20,15 @@ public static uint GetStructFieldOffset(RuntimeTypeHandle structureTypeHandle, s
                 return offset;
             }
 
+            Type structureType = Type.GetTypeFromHandle(structureTypeHandle)!;
+
             // if we can find the struct but couldn't find its field, throw Argument Exception
             if (structExists)
             {
-                throw new ArgumentException(SR.Format(SR.Argument_OffsetOfFieldNotFound, RuntimeAugments.GetLastResortString(structureTypeHandle)), nameof(fieldName));
+                throw new ArgumentException(SR.Format(SR.Argument_OffsetOfFieldNotFound, structureType), nameof(fieldName));
             }
 
-            throw new NotSupportedException(SR.Format(SR.StructMarshalling_MissingInteropData, Type.GetTypeFromHandle(structureTypeHandle)));
+            throw new NotSupportedException(SR.Format(SR.StructMarshalling_MissingInteropData, structureType));
         }
 
         public static int GetStructUnsafeStructSize(RuntimeTypeHandle structureTypeHandle)
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/General/Helpers.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/General/Helpers.cs
@@ -62,11 +62,6 @@ public static RuntimeTypeInfo[] ToRuntimeTypeInfoArray(this Type[] types)
             return typeInfos;
         }
 
-        public static string LastResortString(this RuntimeTypeHandle typeHandle)
-        {
-            return ReflectionCoreExecution.ExecutionEnvironment.GetLastResortString(typeHandle);
-        }
-
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static RuntimeNamedTypeInfo CastToRuntimeNamedTypeInfo(this Type type)
         {
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/General/TypeUnifier.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/General/TypeUnifier.cs
@@ -70,7 +70,7 @@ private static RuntimeArrayTypeInfo WithVerifiedTypeHandle(this RuntimeArrayType
                 && !(elementType is RuntimeCLSIDTypeInfo)
 #endif
                 )
-                throw ReflectionCoreExecution.ExecutionDomain.CreateMissingArrayTypeException(elementType, isMultiDim: false, 1);
+                throw ReflectionCoreExecution.ExecutionDomain.CreateMissingMetadataException(arrayType);
 
             return arrayType;
         }
@@ -109,7 +109,7 @@ private static RuntimeConstructedGenericTypeInfo WithVerifiedTypeHandle(this Run
                         atLeastOneOpenType = true;
                 }
                 if (!atLeastOneOpenType)
-                    throw ReflectionCoreExecution.ExecutionDomain.CreateMissingConstructedGenericTypeException(genericType.GetGenericTypeDefinition(), genericTypeArguments.CloneTypeArray());
+                    throw ReflectionCoreExecution.ExecutionDomain.CreateMissingMetadataException(genericType);
             }
 
             return genericType;
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/TypeInfos/RuntimeConstructedGenericTypeInfo.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/TypeInfos/RuntimeConstructedGenericTypeInfo.cs
@@ -213,10 +213,7 @@ internal sealed override RuntimeNamedTypeInfo AnchoringTypeDefinitionForDeclared
         {
             get
             {
-                RuntimeTypeInfo genericTypeDefinition = this.GenericTypeDefinitionTypeInfo;
-                if (!(genericTypeDefinition is RuntimeNamedTypeInfo genericTypeDefinitionNamedTypeInfo))
-                    throw ReflectionCoreExecution.ExecutionDomain.CreateMissingMetadataException(genericTypeDefinition);
-                return genericTypeDefinitionNamedTypeInfo;
+                return (RuntimeNamedTypeInfo)GenericTypeDefinitionTypeInfo;
             }
         }
 
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.NativeAot.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.NativeAot.cs
@@ -117,7 +117,7 @@ public static unsafe void DestroyStructure(IntPtr ptr, Type structuretype)
                 structureTypeHandle.IsInterface() ||
                 InteropExtensions.AreTypesAssignable(typeof(Delegate).TypeHandle, structureTypeHandle))
             {
-                throw new ArgumentException(SR.Format(SR.Argument_MustHaveLayoutOrBeBlittable, structureTypeHandle.LastResortToString));
+                throw new ArgumentException(SR.Format(SR.Argument_MustHaveLayoutOrBeBlittable, structuretype));
             }
 
             if (structureTypeHandle.IsBlittable())
@@ -128,7 +128,7 @@ public static unsafe void DestroyStructure(IntPtr ptr, Type structuretype)
 
             IntPtr destroyStructureStub = RuntimeInteropData.GetDestroyStructureStub(structureTypeHandle, out bool hasInvalidLayout);
             if (hasInvalidLayout)
-                throw new ArgumentException(SR.Format(SR.Argument_MustHaveLayoutOrBeBlittable, structureTypeHandle.LastResortToString));
+                throw new ArgumentException(SR.Format(SR.Argument_MustHaveLayoutOrBeBlittable, structuretype));
             // DestroyStructureStub == IntPtr.Zero means its fields don't need to be destroyed
             if (destroyStructureStub != IntPtr.Zero)
             {
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/RuntimeTypeHandle.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/RuntimeTypeHandle.cs
@@ -124,36 +124,6 @@ internal bool IsNull
             }
         }
 
-        // Last resort string for Type.ToString() when no metadata around.
-        internal string LastResortToString
-        {
-            get
-            {
-                string s;
-                EETypePtr eeType = this.ToEETypePtr();
-                IntPtr rawEEType = eeType.RawValue;
-                IntPtr moduleBase = RuntimeImports.RhGetOSModuleFromEEType(rawEEType);
-                if (moduleBase != IntPtr.Zero)
-                {
-                    uint rva = (uint)(rawEEType.ToInt64() - moduleBase.ToInt64());
-                    s = "EETypeRva:0x" + rva.LowLevelToString();
-                }
-                else
-                {
-                    s = "EETypePointer:0x" + rawEEType.LowLevelToString();
-                }
-
-                ReflectionExecutionDomainCallbacks callbacks = RuntimeAugments.CallbacksIfAvailable;
-                if (callbacks != null)
-                {
-                    string penultimateLastResortString = callbacks.GetBetterDiagnosticInfoIfAvailable(this);
-                    if (penultimateLastResortString != null)
-                        s += "(" + penultimateLastResortString + ")";
-                }
-                return s;
-            }
-        }
-
         private IntPtr _value;
     }
 }
diff --git a/src/coreclr/nativeaot/System.Private.DisabledReflection/src/Internal/Reflection/ReflectionExecutionDomainCallbacksImplementation.cs b/src/coreclr/nativeaot/System.Private.DisabledReflection/src/Internal/Reflection/ReflectionExecutionDomainCallbacksImplementation.cs
@@ -13,7 +13,6 @@ internal class ReflectionExecutionDomainCallbacksImplementation : ReflectionExec
         public override Exception CreateMissingMetadataException(Type typeWithMissingMetadata) => throw new NotImplementedException();
         public override Type GetArrayTypeForHandle(RuntimeTypeHandle typeHandle) => RuntimeTypeInfo.GetRuntimeTypeInfo(typeHandle);
         public override Assembly GetAssemblyForHandle(RuntimeTypeHandle typeHandle) => new RuntimeAssemblyInfo(typeHandle);
-        public override string GetBetterDiagnosticInfoIfAvailable(RuntimeTypeHandle runtimeTypeHandle) => null;
         public override Type GetByRefTypeForHandle(RuntimeTypeHandle typeHandle) => RuntimeTypeInfo.GetRuntimeTypeInfo(typeHandle);
         public override Type GetConstructedGenericTypeForHandle(RuntimeTypeHandle typeHandle) => RuntimeTypeInfo.GetRuntimeTypeInfo(typeHandle);
         public override MethodInfo GetDelegateMethod(Delegate del) => throw new NotSupportedException(SR.Reflection_Disabled);
diff --git a/src/coreclr/nativeaot/System.Private.DisabledReflection/src/Internal/Reflection/RuntimeTypeInfo.cs b/src/coreclr/nativeaot/System.Private.DisabledReflection/src/Internal/Reflection/RuntimeTypeInfo.cs
@@ -33,7 +33,7 @@ public RuntimeTypeInfo(RuntimeTypeHandle typeHandle)
 
         public override bool IsGenericType => RuntimeAugments.IsGenericTypeDefinition(_typeHandle) || RuntimeAugments.IsGenericType(_typeHandle);
 
-        public override string Name => DoNotThrowForNames ? RuntimeAugments.GetLastResortString(_typeHandle) : throw new NotSupportedException(SR.Reflection_Disabled);
+        public override string Name => DoNotThrowForNames ? ToString() : throw new NotSupportedException(SR.Reflection_Disabled);
 
         public override string Namespace => DoNotThrowForNames ? "" : throw new NotSupportedException(SR.Reflection_Disabled);
 
@@ -76,7 +76,7 @@ protected override TypeCode GetTypeCodeImpl()
 
         public override string ToString()
         {
-            return RuntimeAugments.GetLastResortString(_typeHandle);
+            return "MT" + _typeHandle.Value.ToString();
         }
 
         public override int GetHashCode()
diff --git a/src/coreclr/nativeaot/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ExecutionEnvironmentImplementation.MappingTables.cs b/src/coreclr/nativeaot/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ExecutionEnvironmentImplementation.MappingTables.cs
@@ -159,10 +159,9 @@ public sealed override unsafe bool TryGetArrayTypeForElementType(RuntimeTypeHand
         //
         // This is not equivalent to calling TryGetMultiDimTypeElementType() with a rank of 1!
         //
-        public sealed override unsafe bool TryGetArrayTypeElementType(RuntimeTypeHandle arrayTypeHandle, out RuntimeTypeHandle elementTypeHandle)
+        public sealed override RuntimeTypeHandle GetArrayTypeElementType(RuntimeTypeHandle arrayTypeHandle)
         {
-            elementTypeHandle = RuntimeAugments.GetRelatedParameterTypeHandle(arrayTypeHandle);
-            return true;
+            return RuntimeAugments.GetRelatedParameterTypeHandle(arrayTypeHandle);
         }
 
 
@@ -210,10 +209,9 @@ public sealed override unsafe bool TryGetPointerTypeForTargetType(RuntimeTypeHan
         // Preconditions:
         //      pointerTypeHandle is a valid RuntimeTypeHandle of type pointer.
         //
-        public sealed override unsafe bool TryGetPointerTypeTargetType(RuntimeTypeHandle pointerTypeHandle, out RuntimeTypeHandle targetTypeHandle)
+        public sealed override RuntimeTypeHandle GetPointerTypeTargetType(RuntimeTypeHandle pointerTypeHandle)
         {
-            targetTypeHandle = RuntimeAugments.GetRelatedParameterTypeHandle(pointerTypeHandle);
-            return true;
+            return RuntimeAugments.GetRelatedParameterTypeHandle(pointerTypeHandle);
         }
 
         public override bool TryGetFunctionPointerTypeForComponents(RuntimeTypeHandle returnTypeHandle, RuntimeTypeHandle[] parameterHandles, bool isUnmanaged, out RuntimeTypeHandle functionPointerTypeHandle)
@@ -253,10 +251,9 @@ public sealed override unsafe bool TryGetByRefTypeForTargetType(RuntimeTypeHandl
         // Preconditions:
         //      byRefTypeHandle is a valid RuntimeTypeHandle of a byref.
         //
-        public sealed override unsafe bool TryGetByRefTypeTargetType(RuntimeTypeHandle byRefTypeHandle, out RuntimeTypeHandle targetTypeHandle)
+        public sealed override unsafe RuntimeTypeHandle GetByRefTypeTargetType(RuntimeTypeHandle byRefTypeHandle)
         {
-            targetTypeHandle = RuntimeAugments.GetRelatedParameterTypeHandle(byRefTypeHandle);
-            return true;
+            return RuntimeAugments.GetRelatedParameterTypeHandle(byRefTypeHandle);
         }
 
         //
diff --git a/src/coreclr/nativeaot/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ExecutionEnvironmentImplementation.Runtime.cs b/src/coreclr/nativeaot/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ExecutionEnvironmentImplementation.Runtime.cs
@@ -115,11 +115,6 @@ public sealed override void GetInterfaceMap(Type instanceType, [DynamicallyAcces
             targetMethods = tMethods;
         }
 
-        public sealed override string GetLastResortString(RuntimeTypeHandle typeHandle)
-        {
-            return RuntimeAugments.GetLastResortString(typeHandle);
-        }
-
         //==============================================================================================
         // Miscellaneous
         //==============================================================================================
diff --git a/src/coreclr/nativeaot/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/PayForPlayExperience/MissingMetadataExceptionCreator.cs b/src/coreclr/nativeaot/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/PayForPlayExperience/MissingMetadataExceptionCreator.cs
diff --git a/src/coreclr/nativeaot/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ReflectionDomainSetupImplementation.cs b/src/coreclr/nativeaot/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ReflectionDomainSetupImplementation.cs
diff --git a/src/coreclr/nativeaot/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ReflectionExecutionDomainCallbacksImplementation.cs b/src/coreclr/nativeaot/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ReflectionExecutionDomainCallbacksImplementation.cs

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,7 @@ public abstract class ReflectionDomainSetup`
`13`	`13`	`{`
`14`	`14`	`protected ReflectionDomainSetup() { }`
`15`	`15`	`public abstract AssemblyBinder AssemblyBinder { get; }`
`16`		`- public abstract Exception CreateMissingMetadataException(Type? pertainant);`
	`16`	`+ public abstract Exception CreateMissingMetadataException(Type pertainant);`
`17`	`17`	`public abstract Exception CreateNonInvokabilityException(MemberInfo pertainant);`
`18`		`- public abstract Exception CreateMissingArrayTypeException(Type elementType, bool isMultiDim, int rank);`
`19`		`- public abstract Exception CreateMissingConstructedGenericTypeException(Type genericTypeDefinition, Type[] genericTypeArguments);`
`20`	`18`	`}`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -914,11 +914,6 @@ public static Delegate CreateObjectArrayDelegate(Type delegateType, Func<object?`
`914`	`914`	`return Delegate.CreateObjectArrayDelegate(delegateType, invoker);`
`915`	`915`	`}`
`916`	`916`
`917`		`- public static string GetLastResortString(RuntimeTypeHandle typeHandle)`
`918`		`- {`
`919`		`- return typeHandle.LastResortToString;`
`920`		`- }`
`921`		`-`
`922`	`917`	`public static IntPtr RhHandleAlloc(object value, GCHandleType type)`
`923`	`918`	`{`
`924`	`919`	`return RuntimeImports.RhHandleAlloc(value, type);`
Original file line number	Diff line number	Diff line change
`@@ -20,13 +20,15 @@ public static uint GetStructFieldOffset(RuntimeTypeHandle structureTypeHandle, s`
`20`	`20`	`return offset;`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ Type structureType = Type.GetTypeFromHandle(structureTypeHandle)!;`
	`24`	`+`
`23`	`25`	`// if we can find the struct but couldn't find its field, throw Argument Exception`
`24`	`26`	`if (structExists)`
`25`	`27`	`{`
`26`		`- throw new ArgumentException(SR.Format(SR.Argument_OffsetOfFieldNotFound, RuntimeAugments.GetLastResortString(structureTypeHandle)), nameof(fieldName));`
	`28`	`+ throw new ArgumentException(SR.Format(SR.Argument_OffsetOfFieldNotFound, structureType), nameof(fieldName));`
`27`	`29`	`}`
`28`	`30`
`29`		`- throw new NotSupportedException(SR.Format(SR.StructMarshalling_MissingInteropData, Type.GetTypeFromHandle(structureTypeHandle)));`
	`31`	`+ throw new NotSupportedException(SR.Format(SR.StructMarshalling_MissingInteropData, structureType));`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`public static int GetStructUnsafeStructSize(RuntimeTypeHandle structureTypeHandle)`
Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,6 @@ public static RuntimeTypeInfo[] ToRuntimeTypeInfoArray(this Type[] types)`
`62`	`62`	`return typeInfos;`
`63`	`63`	`}`
`64`	`64`
`65`		`- public static string LastResortString(this RuntimeTypeHandle typeHandle)`
`66`		`- {`
`67`		`- return ReflectionCoreExecution.ExecutionEnvironment.GetLastResortString(typeHandle);`
`68`		`- }`
`69`		`-`
`70`	`65`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`71`	`66`	`public static RuntimeNamedTypeInfo CastToRuntimeNamedTypeInfo(this Type type)`
`72`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ private static RuntimeArrayTypeInfo WithVerifiedTypeHandle(this RuntimeArrayType`
`70`	`70`	`&& !(elementType is RuntimeCLSIDTypeInfo)`
`71`	`71`	`#endif`
`72`	`72`	`)`
`73`		`- throw ReflectionCoreExecution.ExecutionDomain.CreateMissingArrayTypeException(elementType, isMultiDim: false, 1);`
	`73`	`+ throw ReflectionCoreExecution.ExecutionDomain.CreateMissingMetadataException(arrayType);`
`74`	`74`
`75`	`75`	`return arrayType;`
`76`	`76`	`}`
`@@ -109,7 +109,7 @@ private static RuntimeConstructedGenericTypeInfo WithVerifiedTypeHandle(this Run`
`109`	`109`	`atLeastOneOpenType = true;`
`110`	`110`	`}`
`111`	`111`	`if (!atLeastOneOpenType)`
`112`		`- throw ReflectionCoreExecution.ExecutionDomain.CreateMissingConstructedGenericTypeException(genericType.GetGenericTypeDefinition(), genericTypeArguments.CloneTypeArray());`
	`112`	`+ throw ReflectionCoreExecution.ExecutionDomain.CreateMissingMetadataException(genericType);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`return genericType;`
Original file line number	Diff line number	Diff line change
`@@ -213,10 +213,7 @@ internal sealed override RuntimeNamedTypeInfo AnchoringTypeDefinitionForDeclared`
`213`	`213`	`{`
`214`	`214`	`get`
`215`	`215`	`{`
`216`		`- RuntimeTypeInfo genericTypeDefinition = this.GenericTypeDefinitionTypeInfo;`
`217`		`- if (!(genericTypeDefinition is RuntimeNamedTypeInfo genericTypeDefinitionNamedTypeInfo))`
`218`		`- throw ReflectionCoreExecution.ExecutionDomain.CreateMissingMetadataException(genericTypeDefinition);`
`219`		`- return genericTypeDefinitionNamedTypeInfo;`
	`216`	`+ return (RuntimeNamedTypeInfo)GenericTypeDefinitionTypeInfo;`
`220`	`217`	`}`
`221`	`218`	`}`
`222`	`219`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public static unsafe void DestroyStructure(IntPtr ptr, Type structuretype)`
`117`	`117`	`structureTypeHandle.IsInterface() \|\|`
`118`	`118`	`InteropExtensions.AreTypesAssignable(typeof(Delegate).TypeHandle, structureTypeHandle))`
`119`	`119`	`{`
`120`		`- throw new ArgumentException(SR.Format(SR.Argument_MustHaveLayoutOrBeBlittable, structureTypeHandle.LastResortToString));`
	`120`	`+ throw new ArgumentException(SR.Format(SR.Argument_MustHaveLayoutOrBeBlittable, structuretype));`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`if (structureTypeHandle.IsBlittable())`
`@@ -128,7 +128,7 @@ public static unsafe void DestroyStructure(IntPtr ptr, Type structuretype)`
`128`	`128`
`129`	`129`	`IntPtr destroyStructureStub = RuntimeInteropData.GetDestroyStructureStub(structureTypeHandle, out bool hasInvalidLayout);`
`130`	`130`	`if (hasInvalidLayout)`
`131`		`- throw new ArgumentException(SR.Format(SR.Argument_MustHaveLayoutOrBeBlittable, structureTypeHandle.LastResortToString));`
	`131`	`+ throw new ArgumentException(SR.Format(SR.Argument_MustHaveLayoutOrBeBlittable, structuretype));`
`132`	`132`	`// DestroyStructureStub == IntPtr.Zero means its fields don't need to be destroyed`
`133`	`133`	`if (destroyStructureStub != IntPtr.Zero)`
`134`	`134`	`{`