Move ReflectionCoreCallbacks into ReflectionAugments (#109912)

Leftover work identified in #109857.

Author: MichalStrehovsky

src/coreclr/nativeaot/System.Private.CoreLib/src/CompatibilitySuppressions.xml

@@ -653,14 +653,6 @@
  <DiagnosticId>CP0001</DiagnosticId>
  <Target>T:Internal.Metadata.NativeFormat.UInt64Collection</Target>
  </Suppression>
- <Suppression>
- <DiagnosticId>CP0001</DiagnosticId>
- <Target>T:Internal.Reflection.Augments.ReflectionAugments</Target>
- </Suppression>
- <Suppression>
- <DiagnosticId>CP0001</DiagnosticId>
- <Target>T:Internal.Reflection.Augments.ReflectionCoreCallbacks</Target>
- </Suppression>
  <Suppression>
  <DiagnosticId>CP0001</DiagnosticId>
  <Target>T:Internal.Reflection.Core.AssemblyBinder</Target>

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Reflection/Augments/ReflectionAugments.cs

@@ -24,9 +24,6 @@ public static void InitializeExecutionDomain(ExecutionEnvironment executionEnvir
  {
  Debug.Assert(s_executionEnvironment == null);
  s_executionEnvironment = executionEnvironment;
-
- ReflectionCoreCallbacks reflectionCallbacks = new ReflectionCoreCallbacksImplementation();
- ReflectionAugments.Initialize(reflectionCallbacks);
  }
 
  internal static ExecutionEnvironment ExecutionEnvironment

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Reflection/Core/Execution/ReflectionCoreExecution.cs

@@ -171,7 +171,7 @@ protected sealed override IEnumerable<CustomAttributeData> GetDeclaredCustomAttr
 
  public sealed override MethodInfo GetParent(MethodInfo e)
  {
- return ReflectionAugments.ReflectionCoreCallbacks.GetImplicitlyOverriddenBaseClassMethod(e);
+ return ReflectionAugments.GetImplicitlyOverriddenBaseClassMethod(e);
  }
 
  public static readonly MethodCustomAttributeSearcher Default = new MethodCustomAttributeSearcher();
@@ -189,7 +189,7 @@ protected sealed override IEnumerable<CustomAttributeData> GetDeclaredCustomAttr
 
  public sealed override PropertyInfo GetParent(PropertyInfo e)
  {
- return ReflectionAugments.ReflectionCoreCallbacks.GetImplicitlyOverriddenBaseClassProperty(e);
+ return ReflectionAugments.GetImplicitlyOverriddenBaseClassProperty(e);
  }
 
  public static readonly PropertyCustomAttributeSearcher Default = new PropertyCustomAttributeSearcher();
@@ -208,7 +208,7 @@ protected sealed override IEnumerable<CustomAttributeData> GetDeclaredCustomAttr
 
  public sealed override EventInfo GetParent(EventInfo e)
  {
- return ReflectionAugments.ReflectionCoreCallbacks.GetImplicitlyOverriddenBaseClassEvent(e);
+ return ReflectionAugments.GetImplicitlyOverriddenBaseClassEvent(e);
  }
 
  public static readonly EventCustomAttributeSearcher Default = new EventCustomAttributeSearcher();

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Reflection/Extensions/NonPortable/CustomAttributeInheritanceRules.cs

@@ -299,7 +299,7 @@ internal static unsafe void FixupModuleCell(ModuleFixupCell* pCell)
  dllImportSearchPath = pCell->DllImportSearchPathAndCookie & ~InteropDataConstants.HasDllImportSearchPath;
  }
 
- Assembly callingAssembly = ReflectionAugments.ReflectionCoreCallbacks.GetAssemblyForHandle(new RuntimeTypeHandle(pCell->CallingAssemblyType));
+ Assembly callingAssembly = ReflectionAugments.GetAssemblyForHandle(new RuntimeTypeHandle(pCell->CallingAssemblyType));
 
  // First check if there's a NativeLibrary callback and call it to attempt the resolution
  IntPtr hModule = NativeLibrary.LoadLibraryCallbackStub(moduleName, callingAssembly, hasDllImportSearchPath, dllImportSearchPath);

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/CompilerHelpers/InteropHelpers.cs

@@ -30,7 +30,7 @@ public static Type ExtensibleGetType(string typeName, string callingAssemblyName
  // This supports Assembly.GetExecutingAssembly() intrinsic expansion in the compiler
  public static Assembly GetExecutingAssembly(RuntimeTypeHandle typeHandle)
  {
- return ReflectionAugments.ReflectionCoreCallbacks.GetAssemblyForHandle(typeHandle);
+ return ReflectionAugments.GetAssemblyForHandle(typeHandle);
  }
 
  // This supports MethodBase.GetCurrentMethod() intrinsic expansion in the compiler

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/CompilerHelpers/ReflectionHelpers.cs

@@ -425,7 +425,6 @@
  <Compile Include="System\Reflection\Runtime\General\Assignability.cs" />
  <Compile Include="System\Reflection\Runtime\General\Dispensers.NativeFormat.cs" />
  <Compile Include="System\Reflection\Runtime\General\Helpers.NativeFormat.cs" />
- <Compile Include="System\Reflection\Runtime\General\ReflectionCoreCallbacksImplementation.cs" />
  <Compile Include="System\Reflection\Runtime\General\Dispensers.cs" />
  <Compile Include="System\Reflection\Runtime\General\Helpers.cs" />
  <Compile Include="System\Reflection\Runtime\General\IRuntimeMemberInfoWithNoMetadataDefinition.cs" />

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

@@ -109,12 +109,12 @@ private struct StructWithNoConstructor { public StructWithNoConstructor() { } }
  [DebuggerHidden]
  [DebuggerStepThrough]
  public static object? CreateInstance([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] Type type, bool nonPublic)
- => ReflectionAugments.ReflectionCoreCallbacks.ActivatorCreateInstance(type, nonPublic);
+ => ReflectionAugments.ActivatorCreateInstance(type, nonPublic);
 
  [DebuggerHidden]
  [DebuggerStepThrough]
  public static object? CreateInstance([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.NonPublicConstructors | DynamicallyAccessedMemberTypes.PublicConstructors)] Type type, BindingFlags bindingAttr, Binder? binder, object?[]? args, CultureInfo? culture, object?[]? activationAttributes)
- => ReflectionAugments.ReflectionCoreCallbacks.ActivatorCreateInstance(type, bindingAttr, binder, args, culture, activationAttributes);
+ => ReflectionAugments.ActivatorCreateInstance(type, bindingAttr, binder, args, culture, activationAttributes);
 
  [RequiresUnreferencedCode("Type and its constructor could be removed")]
  public static ObjectHandle CreateInstance(string assemblyName, string typeName)

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Activator.NativeAot.cs

@@ -244,7 +244,7 @@ private IntPtr GetActualTargetFunctionPointer(object thisObject)
  }
  else
  {
- DynamicInvokeInfo dynamicInvokeInfo = ReflectionAugments.ReflectionCoreCallbacks.GetDelegateDynamicInvokeInfo(GetType());
+ DynamicInvokeInfo dynamicInvokeInfo = ReflectionAugments.GetDelegateDynamicInvokeInfo(GetType());
 
  object? result = dynamicInvokeInfo.Invoke(_firstParameter, _functionPointer,
  args, binderBundle: null, wrapInTargetInvocationException: true);
@@ -270,7 +270,7 @@ protected virtual MethodInfo GetMethodImpl()
  return GetType().GetMethod("Invoke");
  }
 
- return ReflectionAugments.ReflectionCoreCallbacks.GetDelegateMethod(this);
+ return ReflectionAugments.GetDelegateMethod(this);
  }
 
  internal DiagnosticMethodInfo GetDiagnosticMethodInfo()
@@ -294,7 +294,7 @@ internal DiagnosticMethodInfo GetDiagnosticMethodInfo()
  IntPtr ldftnResult = GetDelegateLdFtnResult(out RuntimeTypeHandle _, out bool isOpenResolver);
  if (isOpenResolver)
  {
- MethodInfo mi = ReflectionAugments.ReflectionCoreCallbacks.GetDelegateMethod(this);
+ MethodInfo mi = ReflectionAugments.GetDelegateMethod(this);
  Type? declaringType = mi.DeclaringType;
  if (declaringType.IsConstructedGenericType)
  declaringType = declaringType.GetGenericTypeDefinition();
@@ -354,17 +354,17 @@ public object? Target
  }
 
  // V2 api: Creates open or closed delegates to static or instance methods - relaxed signature checking allowed.
- public static Delegate CreateDelegate(Type type, object? firstArgument, MethodInfo method, bool throwOnBindFailure) => ReflectionAugments.ReflectionCoreCallbacks.CreateDelegate(type, firstArgument, method, throwOnBindFailure);
+ public static Delegate CreateDelegate(Type type, object? firstArgument, MethodInfo method, bool throwOnBindFailure) => ReflectionAugments.CreateDelegate(type, firstArgument, method, throwOnBindFailure);
 
  // V1 api: Creates open delegates to static or instance methods - relaxed signature checking allowed.
- public static Delegate CreateDelegate(Type type, MethodInfo method, bool throwOnBindFailure) => ReflectionAugments.ReflectionCoreCallbacks.CreateDelegate(type, method, throwOnBindFailure);
+ public static Delegate CreateDelegate(Type type, MethodInfo method, bool throwOnBindFailure) => ReflectionAugments.CreateDelegate(type, method, throwOnBindFailure);
 
  // V1 api: Creates closed delegates to instance methods only, relaxed signature checking disallowed.
  [RequiresUnreferencedCode("The target method might be removed")]
- public static Delegate CreateDelegate(Type type, object target, string method, bool ignoreCase, bool throwOnBindFailure) => ReflectionAugments.ReflectionCoreCallbacks.CreateDelegate(type, target, method, ignoreCase, throwOnBindFailure);
+ public static Delegate CreateDelegate(Type type, object target, string method, bool ignoreCase, bool throwOnBindFailure) => ReflectionAugments.CreateDelegate(type, target, method, ignoreCase, throwOnBindFailure);
 
  // V1 api: Creates open delegates to static methods only, relaxed signature checking disallowed.
- public static Delegate CreateDelegate(Type type, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.AllMethods)] Type target, string method, bool ignoreCase, bool throwOnBindFailure) => ReflectionAugments.ReflectionCoreCallbacks.CreateDelegate(type, target, method, ignoreCase, throwOnBindFailure);
+ public static Delegate CreateDelegate(Type type, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.AllMethods)] Type target, string method, bool ignoreCase, bool throwOnBindFailure) => ReflectionAugments.CreateDelegate(type, target, method, ignoreCase, throwOnBindFailure);
 
  internal IntPtr TryGetOpenStaticFunctionPointer() => (GetThunk(OpenStaticThunk) == _functionPointer) ? _extraFunctionPointerOrData : 0;
 

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Delegate.cs

@@ -69,7 +69,7 @@ private bool TryInitializeMethodBase()
 
  IntPtr methodStartAddress = _ipAddress - _nativeOffset;
  Debug.Assert(RuntimeImports.RhFindMethodStartAddress(_ipAddress) == methodStartAddress);
- _method = ReflectionAugments.ReflectionCoreCallbacks.GetMethodBaseFromStartAddressIfAvailable(methodStartAddress);
+ _method = ReflectionAugments.GetMethodBaseFromStartAddressIfAvailable(methodStartAddress);
  if (_method == null)
  {
  _noMethodBaseAvailable = true;