Skip to content
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.

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

Disambiguate calli thunks based on full calling conventions #73359

Merged
merged 2 commits into from
Aug 5, 2022

Conversation

jkotas
Copy link
Member

@jkotas jkotas commented Aug 4, 2022

@dotnet-issue-labeler
Copy link

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@ghost ghost assigned jkotas Aug 4, 2022
@@ -88,6 +88,14 @@ private static string GetFormatString(ExceptionStringID id)
return SR.InvalidProgram_Vararg;
case ExceptionStringID.InvalidProgramCallVirtFinalize:
return SR.InvalidProgram_CallVirtFinalize;
case ExceptionStringID.InvalidProgramNonStaticMethod:
Copy link
Member Author

Choose a reason for hiding this comment

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

Unrelated bug found by TestCallingConventions test.

Copy link
Member

Choose a reason for hiding this comment

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

This probably fixed the dotnet/runtimelab#1135 issue. Thank you!

@jkotas
Copy link
Member Author

jkotas commented Aug 4, 2022

cc @dotnet/ilc-contrib

Copy link
Member

@MichalStrehovsky MichalStrehovsky left a comment

Choose a reason for hiding this comment

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

Thank you!

I've lifted the smoke test from the other pull request so that we also have a smoke test for this

@@ -88,6 +88,14 @@ private static string GetFormatString(ExceptionStringID id)
return SR.InvalidProgram_Vararg;
case ExceptionStringID.InvalidProgramCallVirtFinalize:
return SR.InvalidProgram_CallVirtFinalize;
case ExceptionStringID.InvalidProgramNonStaticMethod:
Copy link
Member

Choose a reason for hiding this comment

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

This probably fixed the dotnet/runtimelab#1135 issue. Thank you!

@jkotas
Copy link
Member Author

jkotas commented Aug 5, 2022

Linux arm failure is #73247

@jkotas jkotas merged commit 12dc44c into dotnet:main Aug 5, 2022
@jkotas jkotas deleted the calli-thunks branch August 5, 2022 12:51
@ghost ghost locked as resolved and limited conversation to collaborators Sep 4, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Disambiguate CalliMarshallingMethodThunk based on modopts
2 participants