Use EISOP Checker Framework version 3.34.0-eisop1

Fixes #3843. Fixes #3918 FUTURE_COPYBARA_INTEGRATE_REVIEW=#3918 from wmdietl:support-jdk21-ea 02b3d6f PiperOrigin-RevId: 533140132
google · May 18, 2023 · 265b682 · 265b682
1 parent 31d420b
commit 265b682
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/check_api/pom.xml b/check_api/pom.xml
@@ -51,7 +51,7 @@
     </dependency>
     <dependency>
       <!-- GPLv2 with Classpath Exception -->
-      <groupId>org.checkerframework</groupId>
+      <groupId>io.github.eisop</groupId>
       <artifactId>dataflow-errorprone</artifactId>
       <version>${dataflow.version}</version>
     </dependency>

diff --git a/...m/google/errorprone/dataflow/nullnesspropagation/AbstractNullnessPropagationTransfer.java b/...m/google/errorprone/dataflow/nullnesspropagation/AbstractNullnessPropagationTransfer.java
@@ -53,6 +53,7 @@
 import org.checkerframework.errorprone.dataflow.cfg.node.DoubleLiteralNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.EqualToNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.ExplicitThisNode;
+import org.checkerframework.errorprone.dataflow.cfg.node.ExpressionStatementNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.FieldAccessNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.FloatLiteralNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.FloatingDivisionNode;
@@ -1019,6 +1020,20 @@ Nullness visitClassDeclaration() {
     return NULLABLE;
   }
 
+  @Override
+  public final TransferResult<Nullness, AccessPathStore<Nullness>> visitExpressionStatement(
+      ExpressionStatementNode node, TransferInput<Nullness, AccessPathStore<Nullness>> input) {
+    /*
+     * The fact that something is an expression statement is presumably irrelevant to nullness. So
+     * probably no code looks at this result. And if the statement needs to update the store
+     * somehow, that gets handled by the other visit* methods. I think.
+     *
+     * See
+     * https://github.com/eisop/checker-framework/blob/7c5e731da5665cba0612e8c85287d380fd66e924/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ExpressionStatementNode.java#L20
+     */
+    return noStoreChanges(NONNULL, input);
+  }
+
   private static final class ReadableUpdates implements Updates {
     final Map<AccessPath, Nullness> values = new HashMap<>();
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -94,7 +94,7 @@
     </dependency>
     <dependency>
       <!-- GPLv2 with Classpath Exception -->
-      <groupId>org.checkerframework</groupId>
+      <groupId>io.github.eisop</groupId>
       <artifactId>dataflow-errorprone</artifactId>
       <version>${dataflow.version}</version>
     </dependency>

diff --git a/pom.xml b/pom.xml
@@ -35,7 +35,7 @@
     <autoservice.version>1.0.1</autoservice.version>
     <autovalue.version>1.9</autovalue.version>
     <junit.version>4.13.2</junit.version>
-    <dataflow.version>3.27.0</dataflow.version>
+    <dataflow.version>3.34.0-eisop1</dataflow.version>
     <mockito.version>4.9.0</mockito.version>
     <compile.testing.version>0.19</compile.testing.version>
     <caffeine.version>3.0.5</caffeine.version>

diff --git a/test_helpers/pom.xml b/test_helpers/pom.xml
@@ -57,7 +57,7 @@
     </dependency>
     <dependency>
       <!-- GPLv2 with Classpath Exception -->
-      <groupId>org.checkerframework</groupId>
+      <groupId>io.github.eisop</groupId>
       <artifactId>dataflow-errorprone</artifactId>
       <version>${dataflow.version}</version>
     </dependency>