Skip to content

Commit

Permalink
Update Checker Framework dataflow and dependencies
Browse files Browse the repository at this point in the history
I'm taking over from copybara and merging this into one CL, since there were
some breaking changes.

PiperOrigin-RevId: 575917892
  • Loading branch information
cushon authored and Error Prone Team committed Oct 25, 2023
1 parent 661a915 commit 252e608
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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<>();

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 252e608

Please sign in to comment.