diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/DelegateThunks.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/DelegateThunks.cs index cf630ef56f848..3845514eb4db0 100644 --- a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/DelegateThunks.cs +++ b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/DelegateThunks.cs @@ -319,11 +319,11 @@ public override MethodIL EmitIL() } // Fill in delegateArrayLocal - // Wrapper[] delegateArrayLocal = (Wrapper[])this._helperObject + // Delegate.Wrapper[] delegateArrayLocal = (Delegate.Wrapper[])this._helperObject // ldarg.0 (this pointer) - // ldfld Delegate.HelperObjectField - // castclass Wrapper[] + // ldfld Delegate._helperObject + // castclass Delegate.Wrapper[] // stloc delegateArrayLocal codeStream.EmitLdArg(0); codeStream.Emit(ILOpcode.ldfld, emitter.NewToken(HelperObjectField)); @@ -332,6 +332,7 @@ public override MethodIL EmitIL() // Fill in invocationCountLocal // int invocationCountLocal = this._extraFunctionPointerOrData + // ldarg.0 (this pointer) // ldfld Delegate._extraFunctionPointerOrData // stloc invocationCountLocal @@ -357,8 +358,8 @@ public override MethodIL EmitIL() // ldloc delegateArrayLocal // ldloc iteratorLocal - // ldelema System.Delegate - // ldfld Wrapper.Value + // ldelema Delegate.Wrapper + // ldfld Delegate.Wrapper.Value // stloc delegateToCallLocal codeStream.EmitLdLoc(delegateArrayLocal); codeStream.EmitLdLoc(iteratorLocal); @@ -370,10 +371,10 @@ public override MethodIL EmitIL() // returnValueLocal = delegateToCallLocal(...); // ldloc delegateToCallLocal - // ldfld System.Delegate._firstParameter + // ldfld Delegate._firstParameter // ldarg 1, n // ldloc delegateToCallLocal - // ldfld System.Delegate._functionPointer + // ldfld Delegate._functionPointer // calli returnValueType thiscall (all the params) // IF there is a return value // stloc returnValueLocal diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs index 6703771777d34..96911a9289804 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs @@ -456,7 +456,7 @@ unsafe partial class CorInfoImpl { private const CORINFO_RUNTIME_ABI TargetABI = CORINFO_RUNTIME_ABI.CORINFO_CORECLR_ABI; - private uint OffsetOfDelegateFirstTarget => (uint)(3 * PointerSize); // Delegate::_functionPointer + private uint OffsetOfDelegateFirstTarget => (uint)(3 * PointerSize); // Delegate._methodPtr private readonly ReadyToRunCodegenCompilation _compilation; private MethodWithGCInfo _methodCodeNode; diff --git a/src/coreclr/tools/aot/ILCompiler.RyuJit/JitInterface/CorInfoImpl.RyuJit.cs b/src/coreclr/tools/aot/ILCompiler.RyuJit/JitInterface/CorInfoImpl.RyuJit.cs index c3f89c5a86ffb..d6de83e878269 100644 --- a/src/coreclr/tools/aot/ILCompiler.RyuJit/JitInterface/CorInfoImpl.RyuJit.cs +++ b/src/coreclr/tools/aot/ILCompiler.RyuJit/JitInterface/CorInfoImpl.RyuJit.cs @@ -28,7 +28,7 @@ internal unsafe partial class CorInfoImpl { private const CORINFO_RUNTIME_ABI TargetABI = CORINFO_RUNTIME_ABI.CORINFO_NATIVEAOT_ABI; - private uint OffsetOfDelegateFirstTarget => (uint)(4 * PointerSize); // Delegate::_functionPointer + private uint OffsetOfDelegateFirstTarget => (uint)(4 * PointerSize); // Delegate._functionPointer private int SizeOfReversePInvokeTransitionFrame => 2 * PointerSize; private RyuJitCompilation _compilation;