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

Viewpoint adaptation bug on generics? #458

Closed
wants to merge 2 commits into from
+17 −10
Closed

Viewpoint adaptation bug on generics? #458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe9bdf3
fix viewpoint adaptation bugs on generics
AndrewShf Apr 18, 2023
7190b0c
remove addcomputedtypeannotation tree version in interningchecker
AndrewShf Apr 19, 2023
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
4 changes: 1 addition & 3 deletions framework/src/main/java/org/checkerframework/framework/type/AbstractViewpointAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ public void viewpointAdaptMember(
if (!shouldAdaptMember(memberType, memberElement)) {
return;
}

AnnotatedTypeMirror decltype = atypeFactory.getAnnotatedType(memberElement);
AnnotatedTypeMirror combinedType = combineTypeWithType(receiverType, decltype);
AnnotatedTypeMirror combinedType = combineTypeWithType(receiverType, memberType);
AndrewShf marked this conversation as resolved.
Show resolved Hide resolved
memberType.replaceAnnotations(combinedType.getAnnotations());
if (memberType.getKind() == TypeKind.DECLARED
&& combinedType.getKind() == TypeKind.DECLARED) {
Expand Down
17 changes: 17 additions & 0 deletions framework/tests/viewpointtest/AnnoOnTypeVariableUse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import viewpointtest.quals.*;
AndrewShf marked this conversation as resolved.
Show resolved Hide resolved

AndrewShf marked this conversation as resolved.
Show resolved Hide resolved
@SuppressWarnings("cast.unsafe.constructor.invocation")
class Demo<E> {
@ReceiverDependentQual E element;
AndrewShf marked this conversation as resolved.
Show resolved Hide resolved

static void test() {
Demo<@B Element> d = new @A Demo<@B Element>();
// d.element = @A |> @RDQ = @A
// thus expects no error here
d.element = new @A Element();
}
}

class Element {
int f = 1;
}