Skip to content

Add [DebuggerGuidedStepThrough] to new invoker methods #89596

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
merged 3 commits into from
Aug 1, 2023
Merged

Add [DebuggerGuidedStepThrough] to new invoker methods #89596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6903081
Add [DebuggerGuidedStepThrough] to new invoker methods
steveharter Jul 27, 2023
8540dc5
Add using statement
steveharter Jul 28, 2023
8db9f4e
Add PreviousCallContainsDebuggerStepInCode()
steveharter Jul 31, 2023
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
32 changes: 25 additions & 7 deletions src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/ConstructorInvoker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using Internal.Reflection.Core.Execution;
using System.Diagnostics;
using System.Reflection.Runtime.MethodInfos;
using static System.Reflection.DynamicInvokeInfo;

Expand All @@ -28,47 +29,64 @@ public static ConstructorInvoker Create(ConstructorInfo constructor)
return new ConstructorInvoker(runtimeConstructor);
}

[DebuggerGuidedStepThrough]
public object Invoke()
{
return _methodBaseInvoker.CreateInstanceWithFewArgs(new Span<object?>());
object result = _methodBaseInvoker.CreateInstanceWithFewArgs(new Span<object?>());
DebugAnnotations.PreviousCallContainsDebuggerStepInCode();
return result;
}

[DebuggerGuidedStepThrough]
public object Invoke(object? arg1)
{
return _methodBaseInvoker.CreateInstanceWithFewArgs(new Span<object?>(ref arg1));
object result = _methodBaseInvoker.CreateInstanceWithFewArgs(new Span<object?>(ref arg1));
DebugAnnotations.PreviousCallContainsDebuggerStepInCode();
return result;
}

[DebuggerGuidedStepThrough]
public object Invoke(object? arg1, object? arg2)
{
StackAllocatedArguments argStorage = default;
argStorage._args.Set(0, arg1);
argStorage._args.Set(1, arg2);
return _methodBaseInvoker.CreateInstanceWithFewArgs(argStorage._args.AsSpan(2));
object result = _methodBaseInvoker.CreateInstanceWithFewArgs(argStorage._args.AsSpan(2));
DebugAnnotations.PreviousCallContainsDebuggerStepInCode();
return result;
}

[DebuggerGuidedStepThrough]
public object Invoke(object? arg1, object? arg2, object? arg3)
{
StackAllocatedArguments argStorage = default;
argStorage._args.Set(0, arg1);
argStorage._args.Set(1, arg2);
argStorage._args.Set(2, arg3);
return _methodBaseInvoker.CreateInstanceWithFewArgs(argStorage._args.AsSpan(3));
object result = _methodBaseInvoker.CreateInstanceWithFewArgs(argStorage._args.AsSpan(3));
DebugAnnotations.PreviousCallContainsDebuggerStepInCode();
return result;
}

[DebuggerGuidedStepThrough]
public object Invoke(object? arg1, object? arg2, object? arg3, object? arg4)
{
StackAllocatedArguments argStorage = default;
argStorage._args.Set(0, arg1);
argStorage._args.Set(1, arg2);
argStorage._args.Set(2, arg3);
argStorage._args.Set(3, arg4);
return _methodBaseInvoker.CreateInstanceWithFewArgs(argStorage._args.AsSpan(4));
object result = _methodBaseInvoker.CreateInstanceWithFewArgs(argStorage._args.AsSpan(4));
DebugAnnotations.PreviousCallContainsDebuggerStepInCode();
return result;
}

[DebuggerGuidedStepThrough]
public object Invoke(Span<object?> arguments)
{

return _methodBaseInvoker.CreateInstance(arguments);
object result = _methodBaseInvoker.CreateInstance(arguments);
DebugAnnotations.PreviousCallContainsDebuggerStepInCode();
return result;
}
}
}
5 changes: 5 additions & 0 deletions src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/MethodInvoker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,23 @@ public static MethodInvoker Create(MethodBase method)
throw new ArgumentException(SR.Argument_MustBeRuntimeMethod, nameof(method));
}

[DebuggerGuidedStepThrough]
public object? Invoke(object? obj)
{
object? result = _methodBaseInvoker.InvokeDirectWithFewArgs(obj, new Span<object?>());
DebugAnnotations.PreviousCallContainsDebuggerStepInCode();
return result;
}

[DebuggerGuidedStepThrough]
public object? Invoke(object? obj, object? arg1)
{
object? result = _methodBaseInvoker.InvokeDirectWithFewArgs(obj, new Span<object?>(ref arg1));
DebugAnnotations.PreviousCallContainsDebuggerStepInCode();
return result;
}

[DebuggerGuidedStepThrough]
public object? Invoke(object? obj, object? arg1, object? arg2)
{
StackAllocatedArguments argStorage = default;
Expand All @@ -66,6 +69,7 @@ public static MethodInvoker Create(MethodBase method)
return result;
}

[DebuggerGuidedStepThrough]
public object? Invoke(object? obj, object? arg1, object? arg2, object? arg3)
{
StackAllocatedArguments argStorage = default;
Expand All @@ -78,6 +82,7 @@ public static MethodInvoker Create(MethodBase method)
return result;
}

[DebuggerGuidedStepThrough]
public object? Invoke(object? obj, object? arg1, object? arg2, object? arg3, object? arg4)
{
StackAllocatedArguments argStorage = default;
Expand Down