C#: Fix extraction of qualified delegate calls #15484
Merged
Conversation
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
hvitved
force-pushed
the
csharp/qualified-delegate-extraction-fix
branch
from
d74cac2 to
c74bc68
Compare
michaelnebel
previously approved these changes
Feb 1, 2024
tamasvajk
reviewed
Feb 1, 2024
| @@ -33,7 +37,7 @@ protected override void PopulateExpression(TextWriter trapFile) | |||
| var target = TargetSymbol; | |||
| switch (Syntax.Expression) | |||
| { | |||
| case MemberAccessExpressionSyntax memberAccess: | |||
| case MemberAccessExpressionSyntax memberAccess when Kind == ExprKind.METHOD_INVOCATION || IsEventDelegateCall() || IsExplicitDelegateInvokeCall(): | |||
There was a problem hiding this comment.
When is this when condition not the same as Kind == ExprKind.METHOD_INVOCATION || Kind = ExprKind.DELEGATE_INVOCATION?
There was a problem hiding this comment.
Exactly when the member being accessed is not an event or a direct .Invoke, i.e., when it is a field or a property.
|
|
||
| void M() | ||
| { | ||
| this.Field(0); |
There was a problem hiding this comment.
Do we have the same problem with function pointers? (unsafe delegate*<int, void> Field2;)
There was a problem hiding this comment.
We did, yes, but that is also fixed by this PR. I have added additional tests to witness.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR fixes an extractor bug where we would incorrectly determine the qualifier of a delegate call when it was a qualified expression. For example, in
where
LambdaFieldis a field holding a lambda, we would considerthisto be the qualifier of the delegate call, instead ofthis.LambdaField.