From 252e608ea29faacafbf514a8eb967348d9278621 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Mon, 23 Oct 2023 13:46:51 -0700
Subject: [PATCH] Update Checker Framework dataflow and dependencies

I'm taking over from copybara and merging this into one CL, since there were
some breaking changes.

PiperOrigin-RevId: 575917892
---
 .../AbstractNullnessPropagationTransfer.java  | 21 +++++++------------
 pom.xml                                       |  2 +-
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/AbstractNullnessPropagationTransfer.java b/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/AbstractNullnessPropagationTransfer.java
index 19f5dbf30d1b..43f11cb1347e 100644
--- a/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/AbstractNullnessPropagationTransfer.java
+++ b/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/AbstractNullnessPropagationTransfer.java
@@ -50,6 +50,7 @@
 import org.checkerframework.errorprone.dataflow.cfg.node.ConditionalAndNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.ConditionalNotNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.ConditionalOrNode;
+import org.checkerframework.errorprone.dataflow.cfg.node.DeconstructorPatternNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.DoubleLiteralNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.EqualToNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.ExplicitThisNode;
@@ -92,7 +93,6 @@
 import org.checkerframework.errorprone.dataflow.cfg.node.ReturnNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.ShortLiteralNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.SignedRightShiftNode;
-import org.checkerframework.errorprone.dataflow.cfg.node.StringConcatenateAssignmentNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.StringConcatenateNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.StringConversionNode;
 import org.checkerframework.errorprone.dataflow.cfg.node.StringLiteralNode;
@@ -653,18 +653,6 @@ Nullness visitBitwiseXor() {
     return visitBitwiseOperation();
   }
 
-  @Override
-  public final TransferResult<Nullness, AccessPathStore<Nullness>> visitStringConcatenateAssignment(
-      StringConcatenateAssignmentNode node,
-      TransferInput<Nullness, AccessPathStore<Nullness>> input) {
-    Nullness value = visitStringConcatenateAssignment();
-    return noStoreChanges(value, input);
-  }
-
-  Nullness visitStringConcatenateAssignment() {
-    return NULLABLE;
-  }
-
   @Override
   public final TransferResult<Nullness, AccessPathStore<Nullness>> visitLessThan(
       LessThanNode node, TransferInput<Nullness, AccessPathStore<Nullness>> input) {
@@ -1034,6 +1022,13 @@ public final TransferResult<Nullness, AccessPathStore<Nullness>> visitExpression
     return noStoreChanges(NONNULL, input);
   }
 
+  @Override
+  public TransferResult<Nullness, AccessPathStore<Nullness>> visitDeconstructorPattern(
+      DeconstructorPatternNode node, TransferInput<Nullness, AccessPathStore<Nullness>> input) {
+    // TODO(b/307371634): handle DeconstructorPatternNode
+    return noStoreChanges(NONNULL, input);
+  }
+
   private static final class ReadableUpdates implements Updates {
     final Map<AccessPath, Nullness> values = new HashMap<>();
 
diff --git a/pom.xml b/pom.xml
index c6501498e517..31ef0ca95133 100644
--- 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.34.0-eisop1</dataflow.version>
+    <dataflow.version>3.39.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>