Skip to content

[NativeAOT] Add method parameter names to stack trace if available #73578

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 5 commits into from
Aug 18, 2022
Merged

[NativeAOT] Add method parameter names to stack trace if available #73578

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ba83e1
Emit parameter names
jasper-d Aug 5, 2022
a7a931c
Address PR feedback
jasper-d Aug 12, 2022
154f480
Merge remote-tracking branch 'upstream/main' into aot-param-names
jasper-d Aug 16, 2022
78c3e9d
Rename things
jasper-d Aug 16, 2022
f8cad5e
Apply suggestions from code review
MichalStrehovsky Aug 18, 2022
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
Prev Previous commit
Next Next commit
Rename things
  • Loading branch information
@jasper-d
jasper-d committed Aug 16, 2022
commit 78c3e9d2b190947aa286bdd2b25c57a0d8cddd6f
13 changes: 6 additions & 7 deletions .../System.Private.StackTraceMetadata/src/Internal/StackTraceMetadata/MethodNameFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,22 +185,21 @@ private void EmitMethodParameters(MethodSignature methodSignature)
/// <param name="methodHandle">Method handle to use for parameter formatting</param>
private void EmitMethodParameters(MethodHandle methodHandle)
{
bool EnumerateParameters(ref ParameterHandleCollection.Enumerator enumerator, out Parameter parameter)
bool TryGetNextParameter(ref ParameterHandleCollection.Enumerator enumerator, out Parameter parameter)
{
bool hasNext = enumerator.MoveNext();
parameter = hasNext ? enumerator.Current.GetParameter(_metadataReader) : default;

return hasNext;
}

Method method = methodHandle.GetMethod(_metadataReader);
HandleCollection typeVector = method.Signature.GetMethodSignature(_metadataReader).Parameters;
ParameterHandleCollection.Enumerator parameters = method.Parameters.GetEnumerator();

bool hasNext = EnumerateParameters(ref parameters, out Parameter parameter);
if (hasNext && parameter.Sequence == 0)
bool hasParameter = TryGetNextParameter(ref parameters, out Parameter parameter);
if (hasParameter && parameter.Sequence == 0)
{
hasNext = EnumerateParameters(ref parameters, out parameter);
hasParameter = TryGetNextParameter(ref parameters, out parameter);
}

_outputBuilder.Append('(');
Expand All @@ -215,10 +214,10 @@ bool EnumerateParameters(ref ParameterHandleCollection.Enumerator enumerator, ou

EmitTypeName(type, namespaceQualified: false);

if (++typeIndex == parameter.Sequence && hasNext)
if (++typeIndex == parameter.Sequence && hasParameter)
{
string name = parameter.Name.GetConstantStringValue(_metadataReader).Value;
hasNext = EnumerateParameters(ref parameters, out parameter);
hasParameter = TryGetNextParameter(ref parameters, out parameter);

if (!string.IsNullOrEmpty(name))
{
Expand Down