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.

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

Jump to bottom

Don't erase the type argument of receiver #793

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Don't erase the type argument of receiver #793

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ed8e47f
Don't erase the type on the receiver
Ao-senXiong Jun 25, 2024
ab59a90
Merge branch 'master' into type-argument
Ao-senXiong Jun 25, 2024
0df34f6
Add jtreg test case
Ao-senXiong Jun 26, 2024
997dc5d
Merge branch 'master' into type-argument
Ao-senXiong Jun 26, 2024
82c9faa
Empty commit for CI
Ao-senXiong Jun 27, 2024
e160b61
Delete extra folder and rename the file
Ao-senXiong Jun 27, 2024
a5d1fad
Rename the test file and refine the summary
Ao-senXiong Jul 3, 2024
a4387a1
Merge branch 'master' into type-argument
Ao-senXiong Jul 3, 2024
053340d
Merge branch 'master' into type-argument
Ao-senXiong Aug 2, 2024
91dd74f
Merge branch 'master' into type-argument
Ao-senXiong Aug 17, 2024
5768f2c
Merge branch 'master' into type-argument
Ao-senXiong Aug 19, 2024
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
14 changes: 14 additions & 0 deletions checker/jtreg/nullness/NonRawTypeArgumentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
* @test
* @summary Test case for type argument in method invocation.
Copy link
Member

Choose a reason for hiding this comment

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

I find this summary confusing and don't see how this matches the code - there is no type argument there.
You need to say something about what type argument you mean.
Same with the test name 'NonRawTypeArgument` isn't very helpful - all type arguments are non-raw, otherwise there wouldn't be type arguments...

*
* @compile/fail/ref=NonRawTypeArgumentTest.out -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker NonRawTypeArgumentTest.java
*/
public class NonRawTypeArgumentTest<T> {

NonRawTypeArgumentTest() {
foo();
}

void foo() {}
}
4 changes: 4 additions & 0 deletions checker/jtreg/nullness/NonRawTypeArgumentTest.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
NonRawTypeArgumentTest.java:10:12: compiler.err.proc.messager: [method.invocation.invalid] call to foo() not allowed on the given receiver.
found : @UnderInitialization(NonRawTypeArgumentTest.class) NonRawTypeArgumentTest<T extends @Initialized Object>
required: @Initialized NonRawTypeArgumentTest<T extends @Initialized Object>
1 error
2 changes: 1 addition & 1 deletion framework/src/main/java/org/checkerframework/common/basetype/BaseTypeVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3772,7 +3772,7 @@ protected void checkMethodInvocability(
return;
}

AnnotatedTypeMirror methodReceiver = method.getReceiverType().getErased();
AnnotatedTypeMirror methodReceiver = method.getReceiverType();
AnnotatedTypeMirror treeReceiver = methodReceiver.shallowCopy(false);
AnnotatedTypeMirror rcv = atypeFactory.getReceiverType(tree);
Copy link
Member

Choose a reason for hiding this comment

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

The subtype test below is typeHierarchy.isSubtype(treeReceiver, methodReceiver);
treeReceiver is a shallow copy of methodReceiver, with just the main modifier copied from the actual receiver rcv of the method invocation.
So to fix #104 we should really understand better what this code is supposed to do.
What goes from if we use typeHierarchy.isSubtype(rcv, methodReceiver);? Why this strange copying of annotations?

Copy link
Member Author

Choose a reason for hiding this comment

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

I will look into #104 after this PR.


Expand Down
Loading