Update fix structor to contain multiple annotation changes #242
Conversation
This file contains 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
nimakarimipour
commented
Oct 4, 2024
| Set<Location> otherTree = found.tree.stream().map(Fix::toLocation).collect(Collectors.toSet()); | ||
| Set<Location> thisTree = | ||
| this.tree.stream().flatMap(fix -> fix.toLocations().stream()).collect(Collectors.toSet()); | ||
|
|
annotator-core/src/main/java/edu/ucr/cs/riple/core/cache/Impact.java
Outdated
Show resolved
Hide resolved
| @@ -187,7 +187,7 @@ private Set<String> extractUninitializedFieldNames(String errorMessage) { | |||
| * @param region Region where the error is reported. | |||
| * @return Set of fixes for uninitialized fields to resolve the given error. | |||
| */ | |||
| protected ImmutableSet<Fix> generateFixesForUninitializedFields( | |||
| protected ImmutableSet<AddAnnotation> computeAddAnnotationInstancesForUninitializedFields( | |||
| @@ -174,6 +175,10 @@ public boolean declaredInModule(Location location) { | |||
| return methodRegistry.declaredInModule(location); | |||
| } | |||
|
|
|||
| public boolean declaredInModule(Set<Location> locations) { | |||
| /** The fixes which can resolve this error (possibly empty). */ | ||
| protected final ImmutableSet<Fix> resolvingFixes; | ||
| /** The fixes which can resolve this error (possibly null). */ | ||
| protected final Set<Fix> resolvingFixes; |
|
|
||
| public ImmutableSet<Fix> getResolvingFixes() { | ||
| public Set<Fix> getFixes() { |
There was a problem hiding this comment.
Update return type
annotator-core/src/main/java/edu/ucr/cs/riple/core/registries/index/Fix.java
Show resolved
Hide resolved
annotator-core/src/main/java/edu/ucr/cs/riple/core/registries/index/Fix.java
Show resolved
Hide resolved
msridhar
approved these changes
Oct 4, 2024
| @@ -157,7 +157,7 @@ private void executeNextIteration( | |||
| injector.injectFixes(selectedFixes); | |||
| // Update log. | |||
| context.log.updateInjectedAnnotations( | |||
| selectedFixes.stream().map(fix -> fix.change).collect(Collectors.toSet())); | |||
| selectedFixes.stream().flatMap(fix -> fix.changes.stream()).collect(Collectors.toSet())); | |||
There was a problem hiding this comment.
For after this PR: it'd be good to add Google Java Format formatting to this repo, enforced via Spotless. It will get rid of long lines like this one that are hard to read.
There was a problem hiding this comment.
Sure, will do #248
| @@ -51,19 +52,19 @@ public BaseCache(S store) { | |||
|
|
|||
| @Override | |||
| public boolean isUnknown(Fix fix) { | |||
| return !this.store.containsKey(fix.toLocation()); | |||
| return !this.store.containsKey(fix.toLocations()); | |||
There was a problem hiding this comment.
High-level question: why not use Fix as the key type for the maps, instead of Set<Location>?
| */ | ||
| protected ImmutableSet<Fix> generateFixesForUninitializedFields( | ||
| String errorMessage, Region region, ModuleInfo module) { | ||
| private ImmutableSet<AddAnnotation> computeAddAnnotationInstancesForUninitializedFields( |
There was a problem hiding this comment.
We don't make this ImmutableSet<Fix> because we want to evaluate each annotation individually, right?
There was a problem hiding this comment.
Yes exactly, we evaluate each annotation (uninitialized field in this case) individually.
Comment on lines
484
to
486
| .changes | ||
| .iterator() | ||
| .next() |
There was a problem hiding this comment.
Should we also assert that the size of changes is equal to 1?
nimakarimipour
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR introduces a necessary change in preparation for the upcoming major PR that will add support for taint checker inference.
The key change in this PR is the update to the
Fixstructure, which now contains a list of changes rather than a single change. With this new design, aFixinstance represents the smallest unit of annotation changes that the Annotator will evaluate for its impact. If approved, these changes will be applied to the source code. It’s important to note that resolving an error may require adding multiple annotations, and aFixinstance can include a subset or all of these changes.In NullAway inference, we evaluate each annotation individually and apply it if approved. For example, resolving an initialization error may require annotating multiple fields as
@Nullable, but each annotation is evaluated and applied one at a time. In contrast, taint inference requires evaluating all suggested annotations together for a given error.This updated design lays the groundwork for supporting the taint checker inference by accommodating the evaluation of grouped annotations for each error.