Skip to content

Prevent assert if stack trace has function pointer #63787

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 9 commits into from
Jan 17, 2022
Merged

Prevent assert if stack trace has function pointer #63787

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6b7c32a
Prevent crash if stack trace has function pointer
kant2002 Jan 14, 2022
301bce4
Fix wording
kant2002 Jan 14, 2022
d19c78f
Match CoreCLR behaviour
kant2002 Jan 14, 2022
97d04b9
Remove no longer neede parameter
kant2002 Jan 14, 2022
723a237
Add test for function pointer signature in stack trace
kant2002 Jan 15, 2022
0ea16ce
Fix typo
kant2002 Jan 15, 2022
25e4b89
Update src/libraries/System.Diagnostics.StackTrace/tests/StackTraceTe…
kant2002 Jan 15, 2022
ee5c9e4
Change validation of stack trace on Mono
kant2002 Jan 15, 2022
eb91287
Apply issue to test
kant2002 Jan 16, 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
21 changes: 20 additions & 1 deletion .../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 @@ -255,8 +255,12 @@ private void EmitTypeName(Handle typeHandle, bool namespaceQualified)
EmitString(typeHandle.ToGenericParameterHandle(_metadataReader).GetGenericParameter(_metadataReader).Name);
break;

case HandleType.FunctionPointerSignature:
EmitFunctionPointerTypeName(typeHandle.ToFunctionPointerSignatureHandle(_metadataReader));
break;

default:
Debug.Assert(false);
Debug.Assert(false, $"Type handle {typeHandle.HandleType} does not handled");
Copy link
Contributor

@Wraith2 Wraith2 Jan 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"is" or "was" not handled seems more appropriate.

_outputBuilder.Append("???");
break;
}
Expand Down Expand Up @@ -407,6 +411,21 @@ private void EmitPointerTypeName(PointerSignatureHandle pointerSigHandle)
_outputBuilder.Append('*');
}

/// <summary>
/// Emit function pointer type.
/// </summary>
/// <param name="functionPointerSigHandle">Function pointer type specification signature handle</param>
private void EmitFunctionPointerTypeName(FunctionPointerSignatureHandle functionPointerSigHandle)
{
FunctionPointerSignature functionPointerSig = _metadataReader.GetFunctionPointerSignature(functionPointerSigHandle);
_outputBuilder.Append("delegate*<");
Copy link
Member

@MichalStrehovsky MichalStrehovsky Jan 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should emit whatever CoreCLR will emit for this, which is probably not delegate*. Not at my PC anymore but I'm guessing IntPtr. Thanks for looking into this!

MethodSignature methodSignature = functionPointerSig.Signature.GetMethodSignature(_metadataReader);
EmitTypeVector(methodSignature.Parameters);
_outputBuilder.Append(',');
EmitTypeName(methodSignature.ReturnType, namespaceQualified: false);
_outputBuilder.Append('>');
}

/// <summary>
/// Emit by-reference type.
/// </summary>
Expand Down