Skip to content

Viewpoint adaptation bug on generics? #458

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

Closed
AndrewShf wants to merge 2 commits into from
Closed

Viewpoint adaptation bug on generics? #458

Show file tree
Hide file tree
Changes from all commits
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
9 changes: 0 additions & 9 deletions ...r/src/main/java/org/checkerframework/checker/interning/InterningAnnotatedTypeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,6 @@ protected TypeAnnotator createTypeAnnotator() {
return new ListTypeAnnotator(new InterningTypeAnnotator(this), super.createTypeAnnotator());
}

@Override
public void addComputedTypeAnnotations(Tree tree, AnnotatedTypeMirror type, boolean useFlow) {
Element element = TreeUtils.elementFromTree(tree);
if (!type.isAnnotatedInHierarchy(INTERNED) && ElementUtils.isCompileTimeConstant(element)) {
type.addAnnotation(INTERNED);
}
super.addComputedTypeAnnotations(tree, type, useFlow);
}

@Override
public void addComputedTypeAnnotations(Element element, AnnotatedTypeMirror type) {
if (!type.isAnnotatedInHierarchy(INTERNED) && ElementUtils.isCompileTimeConstant(element)) {
Expand Down
1 change: 0 additions & 1 deletion 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,7 +64,6 @@ public void viewpointAdaptMember(
if (!shouldAdaptMember(memberType, memberElement)) {
return;
}

AnnotatedTypeMirror decltype = atypeFactory.getAnnotatedType(memberElement);
AnnotatedTypeMirror combinedType = combineTypeWithType(receiverType, decltype);
memberType.replaceAnnotations(combinedType.getAnnotations());
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.*;
Comment thread
AndrewShf marked this conversation as resolved.

Comment thread
AndrewShf marked this conversation as resolved.
@SuppressWarnings("cast.unsafe.constructor.invocation")
class Demo<E> {
@ReceiverDependentQual E element;
Comment thread
AndrewShf marked this conversation as 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;
}