Skip to content

Remove dead NativeAOT dynamic-delegate path from System.Delegate #131150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MichalStrehovsky merged 2 commits into from
Jul 22, 2026
Merged

Remove dead NativeAOT dynamic-delegate path from System.Delegate #131150

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f97982
Initial plan
Copilot Jul 21, 2026
daa8742
Remove dead NativeAOT dynamic delegate branch from Delegate
Copilot Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 5 additions & 20 deletions src/coreclr/nativeaot/System.Private.CoreLib/src/System/Delegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,27 +228,15 @@ private IntPtr GetActualTargetFunctionPointer(object thisObject)
return OpenMethodResolver.ResolveMethod(_extraFunctionPointerOrData, thisObject);
}

internal bool IsDynamicDelegate() => GetThunk(MulticastThunk) == IntPtr.Zero;

[DebuggerGuidedStepThroughAttribute]
protected virtual object? DynamicInvokeImpl(object?[]? args)
{
if (IsDynamicDelegate())
{
// DynamicDelegate case
object? result = ((Func<object?[]?, object?>)_helperObject)(args);
DebugAnnotations.PreviousCallContainsDebuggerStepInCode();
return result;
}
else
{
DynamicInvokeInfo dynamicInvokeInfo = ReflectionAugments.GetDelegateDynamicInvokeInfo(GetType());
DynamicInvokeInfo dynamicInvokeInfo = ReflectionAugments.GetDelegateDynamicInvokeInfo(GetType());

object? result = dynamicInvokeInfo.Invoke(_target, _methodPtr,
args, binderBundle: null, wrapInTargetInvocationException: true);
DebugAnnotations.PreviousCallContainsDebuggerStepInCode();
return result;
}
object? result = dynamicInvokeInfo.Invoke(_target, _methodPtr,
args, binderBundle: null, wrapInTargetInvocationException: true);
DebugAnnotations.PreviousCallContainsDebuggerStepInCode();
return result;
}

protected virtual MethodInfo GetMethodImpl()
Expand Down Expand Up @@ -492,9 +480,6 @@ protected Delegate CombineImpl(Delegate? d)
if (!InternalEqualTypes(this, d))
throw new ArgumentException(SR.Arg_DlgtTypeMis);

if (IsDynamicDelegate())
throw new InvalidOperationException();

int followCount = 1;
Wrapper[]? followList = d._helperObject as Wrapper[];
if (followList != null)
Expand Down
Loading