Merge branch 'lock-infer-purity' of github.com:mernst/checker-framewo…

…rk into lock-infer-purity
typetools · Sep 28, 2022 · 5cf0fff · 5cf0fff
2 parents 97217b6 + 5e9a80b
commit 5cf0fff
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/framework/src/main/java/org/checkerframework/framework/type/GenericAnnotatedTypeFactory.java b/framework/src/main/java/org/checkerframework/framework/type/GenericAnnotatedTypeFactory.java
@@ -1304,7 +1304,7 @@ protected void performFlowAnalysis(ClassTree classTree) {
 
       TreePath preTreePath = getVisitorTreePath();
 
-      // Don't use getPath, because that depends on the assignmentContext path.
+      // Don't call AnnotatedTypeFactory#getPath, because it uses visitorTreePath.
       setVisitorTreePath(TreePath.getPath(this.root, ct));
 
       // start with the captured store as initialization store

diff --git a/javacutil/src/main/java/org/checkerframework/javacutil/AnnotationProvider.java b/javacutil/src/main/java/org/checkerframework/javacutil/AnnotationProvider.java
@@ -43,5 +43,5 @@ public interface AnnotationProvider {
    * @param methodElement a method
    * @return true if a call to the method does not undo flow-sensitive type refinement
    */
-  public boolean isSideEffectFree(ExecutableElement methodElement);
+  boolean isSideEffectFree(ExecutableElement methodElement);
 }
diff --git a/javacutil/src/main/java/org/checkerframework/javacutil/BasicAnnotationProvider.java b/javacutil/src/main/java/org/checkerframework/javacutil/BasicAnnotationProvider.java
@@ -53,7 +53,6 @@ public boolean isSideEffectFree(ExecutableElement methodElement) {
     List<? extends AnnotationMirror> annotationMirrors = methodElement.getAnnotationMirrors();
 
     for (AnnotationMirror am : annotationMirrors) {
-      @SuppressWarnings("deprecation") // method intended for use by the hierarchy
       boolean found =
           AnnotationUtils.areSameByName(am, "org.checkerframework.dataflow.qual.SideEffectFree");
       if (found) {