-
Notifications
You must be signed in to change notification settings - Fork 11
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
Pull PICO changes #108
Pull PICO changes #108
Conversation
...-test/src/main/java/org/checkerframework/framework/test/diagnostics/TestDiagnosticUtils.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/flow/CFAbstractTransfer.java
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
Outdated
Show resolved
Hide resolved
@@ -1343,7 +1348,7 @@ public void postAsMemberOf( | |||
addAnnotationFromFieldInvariant(type, owner, (VariableElement) element); | |||
} | |||
addComputedTypeAnnotations(element, type); | |||
if (viewpointAdapter != null) { | |||
if (viewpointAdapter != null && type.getKind() != TypeKind.EXECUTABLE) { |
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.
What other uses of viewpointadapter are there in the class?
framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java
Show resolved
Hide resolved
@@ -383,6 +400,48 @@ private boolean visited(AnnotatedTypeMirror atm) { | |||
return res; | |||
} | |||
|
|||
public AnnotationMirrorMap<AnnotationMirrorSet> reduce2( |
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.
Why?
@@ -20,7 +20,6 @@ void uses() { | |||
newTree("hello").put("bye"); | |||
|
|||
MyTree<@UnknownVal String> myTree1 = newTree("hello").put("bye"); | |||
// :: error: (assignment.type.incompatible) |
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.
Another PR
This reverts commit 0bfaae4
Tweak javadoc. Update method name. Improve code.
This can be closed after @lnsun's new pull requests have been merged. |
This PR adapted @baoruiz's branch (pull-pico-changes) to the latest CF.
Close #83
Close #74