Bump Checker Framework dependence to 3.38.0 (#819)

Beyond getting up to date, this is a pre-requisite for addressing #811
uber · Sep 1, 2023 · 7a78bc7 · 7a78bc7
1 parent b7f1326
commit 7a78bc7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -40,7 +40,7 @@ if (project.hasProperty("epApiVersion")) {
 
 def versions = [
     asm                    : "9.3",
-    checkerFramework       : "3.26.0",
+    checkerFramework       : "3.38.0",
     // for comparisons in other parts of the build
     errorProneLatest       : latestErrorProneVersion,
     // The version of Error Prone used to check NullAway's code.

diff --git a/nullaway/src/main/java/com/uber/nullaway/dataflow/AccessPathNullnessPropagation.java b/nullaway/src/main/java/com/uber/nullaway/dataflow/AccessPathNullnessPropagation.java
@@ -75,6 +75,7 @@
 import org.checkerframework.nullaway.dataflow.cfg.node.DoubleLiteralNode;
 import org.checkerframework.nullaway.dataflow.cfg.node.EqualToNode;
 import org.checkerframework.nullaway.dataflow.cfg.node.ExplicitThisNode;
+import org.checkerframework.nullaway.dataflow.cfg.node.ExpressionStatementNode;
 import org.checkerframework.nullaway.dataflow.cfg.node.FieldAccessNode;
 import org.checkerframework.nullaway.dataflow.cfg.node.FloatLiteralNode;
 import org.checkerframework.nullaway.dataflow.cfg.node.FloatingDivisionNode;
@@ -113,7 +114,6 @@
 import org.checkerframework.nullaway.dataflow.cfg.node.ReturnNode;
 import org.checkerframework.nullaway.dataflow.cfg.node.ShortLiteralNode;
 import org.checkerframework.nullaway.dataflow.cfg.node.SignedRightShiftNode;
-import org.checkerframework.nullaway.dataflow.cfg.node.StringConcatenateAssignmentNode;
 import org.checkerframework.nullaway.dataflow.cfg.node.StringConcatenateNode;
 import org.checkerframework.nullaway.dataflow.cfg.node.StringConversionNode;
 import org.checkerframework.nullaway.dataflow.cfg.node.StringLiteralNode;
@@ -376,13 +376,6 @@ public TransferResult<Nullness, NullnessStore> visitBitwiseXor(
     return noStoreChanges(NONNULL, input);
   }
 
-  @Override
-  public TransferResult<Nullness, NullnessStore> visitStringConcatenateAssignment(
-      StringConcatenateAssignmentNode stringConcatenateAssignmentNode,
-      TransferInput<Nullness, NullnessStore> input) {
-    return noStoreChanges(NULLABLE, input);
-  }
-
   @Override
   public TransferResult<Nullness, NullnessStore> visitLessThan(
       LessThanNode lessThanNode, TransferInput<Nullness, NullnessStore> input) {
@@ -1085,6 +1078,13 @@ public TransferResult<Nullness, NullnessStore> visitClassDeclaration(
     return noStoreChanges(NULLABLE, input);
   }
 
+  @Override
+  public TransferResult<Nullness, NullnessStore> visitExpressionStatement(
+      ExpressionStatementNode expressionStatementNode,
+      TransferInput<Nullness, NullnessStore> input) {
+    return noStoreChanges(NULLABLE, input);
+  }
+
   @Override
   public TransferResult<Nullness, NullnessStore> visitPackageName(
       PackageNameNode packageNameNode, TransferInput<Nullness, NullnessStore> input) {

diff --git a/nullaway/src/main/java/com/uber/nullaway/dataflow/cfg/NullAwayCFGBuilder.java b/nullaway/src/main/java/com/uber/nullaway/dataflow/cfg/NullAwayCFGBuilder.java
@@ -187,7 +187,7 @@ public <R, D> R accept(TreeVisitor<R, D> visitor, D data) {
                     }
                   },
                   booleanExpressionNode,
-                  this.getProcessingEnvironment().getTypeUtils()),
+                  this.env.getTypeUtils()),
               errorType);
       exNode.setTerminatesExecution(true);
       this.addLabelForNextNode(endPrecondition);