Update checker framework version 3.11.0

./third_party/java/checker_framework/update-checker \ --old_version 3.7.1 \ --checker_release 3.11.0 PiperOrigin-RevId: 363008256
google · Mar 15, 2021 · d1b93d4 · d1b93d4
1 parent 7d48a43
commit d1b93d4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/check_api/src/main/java/com/google/errorprone/dataflow/AccessPathStore.java b/check_api/src/main/java/com/google/errorprone/dataflow/AccessPathStore.java
@@ -27,7 +27,7 @@
 import org.checkerframework.shaded.dataflow.analysis.AbstractValue;
 import org.checkerframework.shaded.dataflow.analysis.Store;
 import org.checkerframework.shaded.dataflow.cfg.visualize.CFGVisualizer;
-import org.checkerframework.shaded.dataflow.expression.Receiver;
+import org.checkerframework.shaded.dataflow.expression.JavaExpression;
 
 /**
  * Immutable map from local variables or heap access paths to their {@link AbstractValue}
@@ -94,7 +94,7 @@ public AccessPathStore<V> widenedUpperBound(AccessPathStore<V> vAccessPathStore)
   }
 
   @Override
-  public boolean canAlias(Receiver a, Receiver b) {
+  public boolean canAlias(JavaExpression a, JavaExpression b) {
     return true;
   }
 

diff --git a/...m/google/errorprone/dataflow/nullnesspropagation/AbstractNullnessPropagationTransfer.java b/...m/google/errorprone/dataflow/nullnesspropagation/AbstractNullnessPropagationTransfer.java
@@ -52,15 +52,15 @@
 import org.checkerframework.shaded.dataflow.cfg.node.ConditionalOrNode;
 import org.checkerframework.shaded.dataflow.cfg.node.DoubleLiteralNode;
 import org.checkerframework.shaded.dataflow.cfg.node.EqualToNode;
-import org.checkerframework.shaded.dataflow.cfg.node.ExplicitThisLiteralNode;
+import org.checkerframework.shaded.dataflow.cfg.node.ExplicitThisNode;
 import org.checkerframework.shaded.dataflow.cfg.node.FieldAccessNode;
 import org.checkerframework.shaded.dataflow.cfg.node.FloatLiteralNode;
 import org.checkerframework.shaded.dataflow.cfg.node.FloatingDivisionNode;
 import org.checkerframework.shaded.dataflow.cfg.node.FloatingRemainderNode;
 import org.checkerframework.shaded.dataflow.cfg.node.FunctionalInterfaceNode;
 import org.checkerframework.shaded.dataflow.cfg.node.GreaterThanNode;
 import org.checkerframework.shaded.dataflow.cfg.node.GreaterThanOrEqualNode;
-import org.checkerframework.shaded.dataflow.cfg.node.ImplicitThisLiteralNode;
+import org.checkerframework.shaded.dataflow.cfg.node.ImplicitThisNode;
 import org.checkerframework.shaded.dataflow.cfg.node.InstanceOfNode;
 import org.checkerframework.shaded.dataflow.cfg.node.IntegerDivisionNode;
 import org.checkerframework.shaded.dataflow.cfg.node.IntegerLiteralNode;
@@ -175,8 +175,8 @@ Nullness visitNumericalOperation() {
     return NULLABLE;
   }
 
-  /** "Summary" method called by default for every {@code ThisLiteralNode}. */
-  Nullness visitThisLiteral() {
+  /** "Summary" method called by default for every {@code ThisNode}. */
+  Nullness visitThis() {
     return NULLABLE;
   }
 
@@ -762,25 +762,25 @@ Nullness visitArrayAccess(ArrayAccessNode node, SubNodeValues inputs, Updates up
   }
 
   @Override
-  public final TransferResult<Nullness, AccessPathStore<Nullness>> visitImplicitThisLiteral(
-      ImplicitThisLiteralNode node, TransferInput<Nullness, AccessPathStore<Nullness>> input) {
-    Nullness value = visitImplicitThisLiteral();
+  public final TransferResult<Nullness, AccessPathStore<Nullness>> visitImplicitThis(
+      ImplicitThisNode node, TransferInput<Nullness, AccessPathStore<Nullness>> input) {
+    Nullness value = visitImplicitThis();
     return noStoreChanges(value, input);
   }
 
-  Nullness visitImplicitThisLiteral() {
-    return visitThisLiteral();
+  Nullness visitImplicitThis() {
+    return visitThis();
   }
 
   @Override
-  public final TransferResult<Nullness, AccessPathStore<Nullness>> visitExplicitThisLiteral(
-      ExplicitThisLiteralNode node, TransferInput<Nullness, AccessPathStore<Nullness>> input) {
-    Nullness value = visitExplicitThisLiteral();
+  public final TransferResult<Nullness, AccessPathStore<Nullness>> visitExplicitThis(
+      ExplicitThisNode node, TransferInput<Nullness, AccessPathStore<Nullness>> input) {
+    Nullness value = visitExplicitThis();
     return noStoreChanges(value, input);
   }
 
-  Nullness visitExplicitThisLiteral() {
-    return visitThisLiteral();
+  Nullness visitExplicitThis() {
+    return visitThis();
   }
 
   @Override

diff --git a/.../java/com/google/errorprone/dataflow/nullnesspropagation/NullnessPropagationTransfer.java b/.../java/com/google/errorprone/dataflow/nullnesspropagation/NullnessPropagationTransfer.java
@@ -25,8 +25,8 @@
 import static com.google.errorprone.dataflow.nullnesspropagation.Nullness.NULLABLE;
 import static com.sun.tools.javac.code.TypeTag.BOOLEAN;
 import static javax.lang.model.element.ElementKind.EXCEPTION_PARAMETER;
+import static org.checkerframework.shaded.javacutil.TreePathUtil.enclosingOfClass;
 import static org.checkerframework.shaded.javacutil.TreeUtils.elementFromDeclaration;
-import static org.checkerframework.shaded.javacutil.TreeUtils.enclosingOfClass;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
@@ -353,7 +353,7 @@ NullnessPropagationTransfer setCompilationUnit(@Nullable CompilationUnitTree com
   // Literals
 
   @Override
-  Nullness visitThisLiteral() {
+  Nullness visitThis() {
     return NONNULL;
   }
 

diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,7 @@
     <autoservice.version>1.0-rc6</autoservice.version>
     <autovalue.version>1.7</autovalue.version>
     <junit.version>4.13.1</junit.version>
-    <dataflow.version>3.7.1</dataflow.version>
+    <dataflow.version>3.11.0</dataflow.version>
     <mockito.version>2.25.0</mockito.version>
     <compile.testing.version>0.18</compile.testing.version>
     <caffeine.version>2.8.8</caffeine.version>