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 index c4d34c124ce..5ebc52366c7 100644 --- 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 widenedUpperBound(AccessPathStore vAccessPathStore) } @Override - public boolean canAlias(Receiver a, Receiver b) { + public boolean canAlias(JavaExpression a, JavaExpression b) { return true; } 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 4c921690265..ef145c8e0c8 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 @@ -52,7 +52,7 @@ 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; @@ -60,7 +60,7 @@ 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> visitImplicitThisLiteral( - ImplicitThisLiteralNode node, TransferInput> input) { - Nullness value = visitImplicitThisLiteral(); + public final TransferResult> visitImplicitThis( + ImplicitThisNode node, TransferInput> input) { + Nullness value = visitImplicitThis(); return noStoreChanges(value, input); } - Nullness visitImplicitThisLiteral() { - return visitThisLiteral(); + Nullness visitImplicitThis() { + return visitThis(); } @Override - public final TransferResult> visitExplicitThisLiteral( - ExplicitThisLiteralNode node, TransferInput> input) { - Nullness value = visitExplicitThisLiteral(); + public final TransferResult> visitExplicitThis( + ExplicitThisNode node, TransferInput> input) { + Nullness value = visitExplicitThis(); return noStoreChanges(value, input); } - Nullness visitExplicitThisLiteral() { - return visitThisLiteral(); + Nullness visitExplicitThis() { + return visitThis(); } @Override diff --git a/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/NullnessPropagationTransfer.java b/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/NullnessPropagationTransfer.java index b0a9992c742..79282de5829 100644 --- a/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/NullnessPropagationTransfer.java +++ b/check_api/src/main/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 index 688706fecc8..a44b6382a2c 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 1.0-rc6 1.7 4.13.1 - 3.7.1 + 3.11.0 2.25.0 0.18 2.8.8