-
Notifications
You must be signed in to change notification settings - Fork 128
Fixing a null ref exception related to function pointers and interfaces #2354
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
b8411e9
Adding a regression test covering an interface method with a function…
tannergooding c7e648e
Fixing a null ref exception related to function pointers and interfaces
tannergooding 599829d
Run lint.cmd
tannergooding 57f2962
Don't optimistically handle null TypeReference
tannergooding File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
...no.Linker.Tests.Cases/FunctionPointers/CanCompileInterfaceWithFunctionPointerParameter.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using Mono.Linker.Tests.Cases.Expectations.Assertions; | ||
| using Mono.Linker.Tests.Cases.Expectations.Metadata; | ||
|
|
||
| namespace Mono.Linker.Tests.Cases.FunctionPointers | ||
| { | ||
| [SetupCompileArgument ("/unsafe")] | ||
| unsafe class CanCompileInterfaceWithFunctionPointerParameter | ||
| { | ||
| public static void Main () | ||
| { | ||
| new CanCompileInterfaceWithFunctionPointerParameter.B ().Method (null); | ||
| } | ||
|
|
||
| [KeptMember (".ctor()")] | ||
| class B : I | ||
| { | ||
| public void Unused (delegate* unmanaged<void> fnptr) | ||
| { | ||
| } | ||
|
|
||
| [Kept] | ||
| public void Method (delegate* unmanaged<void> fnptr) | ||
| { | ||
| } | ||
| } | ||
|
|
||
| interface I | ||
| { | ||
| void Unused (delegate* unmanaged<void> fnptr); | ||
|
|
||
| void Method (delegate* unmanaged<void> fnptr); | ||
| } | ||
| } | ||
| } |
30 changes: 30 additions & 0 deletions
30
.../Mono.Linker.Tests.Cases/FunctionPointers/CanCompileMethodWithFunctionPointerParameter.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using Mono.Linker.Tests.Cases.Expectations.Assertions; | ||
| using Mono.Linker.Tests.Cases.Expectations.Metadata; | ||
|
|
||
| namespace Mono.Linker.Tests.Cases.FunctionPointers | ||
| { | ||
| [SetupCompileArgument ("/unsafe")] | ||
| unsafe class CanCompileMethodWithFunctionPointerParameter | ||
| { | ||
| public static void Main () | ||
| { | ||
| new CanCompileMethodWithFunctionPointerParameter.B ().Method (null); | ||
| } | ||
|
|
||
| [KeptMember (".ctor()")] | ||
| class B | ||
| { | ||
| public void Unused (delegate* unmanaged<void> fnptr) | ||
| { | ||
| } | ||
|
|
||
| [Kept] | ||
| public void Method (delegate* unmanaged<void> fnptr) | ||
| { | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not 100% this is covering everything, but it at least appears to work correctly with the function pointers I have declared.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Most notably, function pointers can't be generic but they can have generic use generic types for the return type or parameter if the parent scope is generic
There isn't a
contextavailable here, so I'm unsure if there needs to be any additional handling or logic to cover that scenario.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are also
modreqthat can appear as part of the calling convention. I thinkmodreqare handled further up in theTypeMatchlogic, however.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the generic return/parameter types are covered by the
GenericInstanceTypecase inTypeMatch (TypeSpecification, TypeSpecification).