Implement capture conversion.#3922
Merged
mernst merged 279 commits intotypetools:masterfrom Jul 13, 2021
Merged
Conversation
mernst
requested changes
Nov 23, 2020
framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
Outdated
Show resolved
Hide resolved
javacutil/src/main/java/org/checkerframework/javacutil/TypesUtils.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
Outdated
Show resolved
Hide resolved
mernst
requested changes
Nov 23, 2020
Member
mernst
left a comment
There was a problem hiding this comment.
Here are comments on the DefaultTypeHierarchy changes.
framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java
Outdated
Show resolved
Hide resolved
mernst
requested changes
Nov 24, 2020
framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
Outdated
Show resolved
Hide resolved
framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
Outdated
Show resolved
Hide resolved
…for-loop-capture # Conflicts: # dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/MethodInvocationNode.java
# Conflicts: # dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/CFGTranslationPhaseOne.java # dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/MethodInvocationNode.java # framework/src/main/java/org/checkerframework/framework/flow/CFAbstractTransfer.java
…work into capture-conversion
…version # Conflicts: # framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java
…work into capture-conversion
mernst
approved these changes
Jul 12, 2021
Member
mernst
left a comment
There was a problem hiding this comment.
I have a question, then feel free to merge. Thanks again for this big improvement!
framework/src/main/java/org/checkerframework/framework/util/AnnotatedTypes.java
Outdated
Show resolved
Hide resolved
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Merge with plume-lib/plume-util#157.
This pull request implements capture conversion. This required several related changes:
isContainedByinDefaultTypeHierarchy.To understand capture conversion, you need to understand the following sections of the JLS:
Reviewing order:
AnnotatedTypeFactory#applyCaptureConversion(AnnotatedTypeMirror)DefaultTypeHierarchy#isContainedByFixes #3013, fixes #3754, fixes #3791, fixes #3845, fixes #3970, and fixes #4523.