diff --git a/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/inference/NullnessQualifierInference.java b/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/inference/NullnessQualifierInference.java index 8b47db97e17..168734dc7f8 100644 --- a/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/inference/NullnessQualifierInference.java +++ b/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/inference/NullnessQualifierInference.java @@ -128,7 +128,7 @@ public Void visitIdentifier(IdentifierTree node, Void unused) { generateConstraintsFromAnnotations( ((JCIdent) node).type, sym, declaredType, node, new ArrayDeque<>()); } - return super.visitIdentifier(node, unused); + return super.visitIdentifier(node, null); } private void generateConstraintsFromAnnotations( @@ -192,7 +192,7 @@ public Void visitAssignment(AssignmentTree node, Void unused) { ? ((JCArrayAccess) node.getVariable()).getExpression().type : TreeInfo.symbol((JCTree) node.getVariable()).type; generateConstraintsForWrite(lhsType, null, node.getExpression(), node); - return super.visitAssignment(node, unused); + return super.visitAssignment(node, null); } @Override @@ -201,7 +201,7 @@ public Void visitVariable(VariableTree node, Void unused) { Symbol symbol = TreeInfo.symbolFor((JCTree) node); generateConstraintsForWrite(symbol.type, symbol, node.getInitializer(), node); } - return super.visitVariable(node, unused); + return super.visitVariable(node, null); } @Override @@ -211,7 +211,7 @@ public Void visitReturn(ReturnTree node, Void unused) { ((MethodSymbol) TreeInfo.symbolFor((JCTree) currentMethodOrInitializerOrLambda)); generateConstraintsForWrite(sym.getReturnType(), sym, node.getExpression(), node); } - return super.visitReturn(node, unused); + return super.visitReturn(node, null); } private static ImmutableList expandVarargsToArity( @@ -319,7 +319,7 @@ public Void visitMethodInvocation(MethodInvocationTree node, Void unused) { actual, iv -> qualifierConstraints.putEdge(iv, typeVarIv))); } - return super.visitMethodInvocation(node, unused); + return super.visitMethodInvocation(node, null); } private static void visitTypeVarRefs( diff --git a/check_api/src/main/java/com/google/errorprone/fixes/SuggestedFixes.java b/check_api/src/main/java/com/google/errorprone/fixes/SuggestedFixes.java index b278de56b08..ab627fcc064 100644 --- a/check_api/src/main/java/com/google/errorprone/fixes/SuggestedFixes.java +++ b/check_api/src/main/java/com/google/errorprone/fixes/SuggestedFixes.java @@ -797,7 +797,7 @@ public Void visitMemberReference(MemberReferenceTree tree, Void unused) { state.getEndPosition(tree), "::" + replacement); } - return super.visitMemberReference(tree, unused); + return super.visitMemberReference(tree, null); } }.scan(state.getPath().getCompilationUnit(), null); return fix.build(); diff --git a/check_api/src/main/java/com/google/errorprone/matchers/HasIdentifier.java b/check_api/src/main/java/com/google/errorprone/matchers/HasIdentifier.java index c6b42907b8b..ff6292d053b 100644 --- a/check_api/src/main/java/com/google/errorprone/matchers/HasIdentifier.java +++ b/check_api/src/main/java/com/google/errorprone/matchers/HasIdentifier.java @@ -66,7 +66,7 @@ public Boolean reduce(Boolean r1, Boolean r2) { @Override public Boolean visitClass(ClassTree node, Void v) { - return firstNonNull(super.visitClass(node, v), false); + return firstNonNull(super.visitClass(node, null), false); } } } diff --git a/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java b/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java index 7882a03e7ca..893325229ab 100644 --- a/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java +++ b/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java @@ -2020,7 +2020,7 @@ public Type visitMethod(MethodTree node, Void unused) { @Override public Type visitParenthesized(ParenthesizedTree node, Void unused) { - return visit(node.getExpression(), unused); + return visit(node.getExpression(), null); } @Nullable diff --git a/check_api/src/main/java/com/google/errorprone/util/FindIdentifiers.java b/check_api/src/main/java/com/google/errorprone/util/FindIdentifiers.java index 4233f2524d2..b7f0b34a9ef 100644 --- a/check_api/src/main/java/com/google/errorprone/util/FindIdentifiers.java +++ b/check_api/src/main/java/com/google/errorprone/util/FindIdentifiers.java @@ -355,7 +355,7 @@ private static TreeScanner createFindIdentifiersScanner( return new TreeScanner() { @Override public Void scan(Tree tree, Void unused) { - return Objects.equals(stoppingPoint, tree) ? null : super.scan(tree, unused); + return Objects.equals(stoppingPoint, tree) ? null : super.scan(tree, null); } @Override @@ -370,7 +370,7 @@ public Void scan(Iterable iterable, Void unused) { } iterable = builder.build(); } - return super.scan(iterable, unused); + return super.scan(iterable, null); } @Override diff --git a/check_api/src/main/java/com/google/errorprone/util/SideEffectAnalysis.java b/check_api/src/main/java/com/google/errorprone/util/SideEffectAnalysis.java index 21f67f9a34b..b2e658fd64a 100644 --- a/check_api/src/main/java/com/google/errorprone/util/SideEffectAnalysis.java +++ b/check_api/src/main/java/com/google/errorprone/util/SideEffectAnalysis.java @@ -93,6 +93,6 @@ public Void visitUnary(UnaryTree tree, Void unused) { default: break; } - return super.visitUnary(tree, unused); + return super.visitUnary(tree, null); } } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/AbstractMustBeClosedChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/AbstractMustBeClosedChecker.java index e65fafd6230..048d3fb15f0 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/AbstractMustBeClosedChecker.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/AbstractMustBeClosedChecker.java @@ -161,13 +161,13 @@ private void visitNewClassOrMethodInvocation(ExpressionTree tree) { @Override public Void visitMethodInvocation(MethodInvocationTree tree, Void unused) { visitNewClassOrMethodInvocation(tree); - return super.visitMethodInvocation(tree, unused); + return super.visitMethodInvocation(tree, null); } @Override public Void visitNewClass(NewClassTree tree, Void unused) { visitNewClassOrMethodInvocation(tree); - return super.visitNewClass(tree, unused); + return super.visitNewClass(tree, null); } }.scan(new TreePath(state.getPath(), body), null); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/BadImport.java b/core/src/main/java/com/google/errorprone/bugpatterns/BadImport.java index cae5f9bc4b4..402a27c33d7 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/BadImport.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/BadImport.java @@ -241,7 +241,7 @@ public IdentifierTree visitIdentifier(IdentifierTree node, Void unused) { return node; } } - return super.visitIdentifier(node, unused); + return super.visitIdentifier(node, null); } // We need to move any type annotation inside the qualified usage to preserve semantics, diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/CanonicalDuration.java b/core/src/main/java/com/google/errorprone/bugpatterns/CanonicalDuration.java index df6d1ce78ca..e84e865e497 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/CanonicalDuration.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/CanonicalDuration.java @@ -294,7 +294,7 @@ public Void scan(Tree node, Void unused) { if (notFirst.get()) { return null; } - return super.scan(node, unused); + return super.scan(node, null); } @Override @@ -308,9 +308,9 @@ public Void visitMethodInvocation(MethodInvocationTree node, Void unused) { } sameMethodInvocations.add(node); - return super.visitMethodInvocation(node, unused); + return super.visitMethodInvocation(node, null); } - return super.visitMethodInvocation(node, unused); + return super.visitMethodInvocation(node, null); } }.scan(expressionPath.getLeaf(), null); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/CatchFail.java b/core/src/main/java/com/google/errorprone/bugpatterns/CatchFail.java index bd3cd41b8f1..14288fd1301 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/CatchFail.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/CatchFail.java @@ -234,7 +234,7 @@ public Void visitIdentifier(IdentifierTree node, Void unused) { if (Objects.equals(sym, ASTHelpers.getSymbol(node))) { found[0] = true; } - return super.visitIdentifier(node, unused); + return super.visitIdentifier(node, null); } }, null); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ConstantPatternCompile.java b/core/src/main/java/com/google/errorprone/bugpatterns/ConstantPatternCompile.java index 543e6b8c88b..24805c6cd4b 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/ConstantPatternCompile.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/ConstantPatternCompile.java @@ -106,7 +106,7 @@ public Void visitMethodInvocation(MethodInvocationTree tree, Void unused) { firstHit[0] = tree; } }); - return super.visitMethodInvocation(tree, unused); + return super.visitMethodInvocation(tree, null); } private Optional tryFix( diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ExpectedExceptionChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/ExpectedExceptionChecker.java index 84e362651aa..15d05bb671a 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/ExpectedExceptionChecker.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/ExpectedExceptionChecker.java @@ -113,7 +113,7 @@ public Void visitBlock(BlockTree block, Void unused) { if (description != NO_MATCH) { state.reportMatch(description); } - return super.visitBlock(block, unused); + return super.visitBlock(block, null); } }, null); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ExtendingJUnitAssert.java b/core/src/main/java/com/google/errorprone/bugpatterns/ExtendingJUnitAssert.java index 997b61445ab..8dc946e60db 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/ExtendingJUnitAssert.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/ExtendingJUnitAssert.java @@ -70,7 +70,7 @@ public Void visitMethodInvocation(MethodInvocationTree tree, Void unused) { String assertType = ASTHelpers.getSymbol(tree).getSimpleName().toString(); fix.addStaticImport("org.junit.Assert." + assertType); } - return super.visitMethodInvocation(tree, unused); + return super.visitMethodInvocation(tree, null); } }, null); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeLocal.java b/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeLocal.java index c534d79d459..10842c4b8d6 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeLocal.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeLocal.java @@ -123,7 +123,7 @@ public Void visitClass(ClassTree classTree, Void unused) { return null; } inMethod = false; - return super.visitClass(classTree, unused); + return super.visitClass(classTree, null); } @Override diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ImpossibleNullComparison.java b/core/src/main/java/com/google/errorprone/bugpatterns/ImpossibleNullComparison.java index 6986bed107d..8307cc6c725 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/ImpossibleNullComparison.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/ImpossibleNullComparison.java @@ -172,12 +172,12 @@ private NullComparisonScanner(VisitorState state) { @Override public Void visitMethod(MethodTree method, Void unused) { - return isSuppressed(method, state) ? null : super.visitMethod(method, unused); + return isSuppressed(method, state) ? null : super.visitMethod(method, null); } @Override public Void visitClass(ClassTree clazz, Void unused) { - return isSuppressed(clazz, state) ? null : super.visitClass(clazz, unused); + return isSuppressed(clazz, state) ? null : super.visitClass(clazz, null); } @Override diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/InconsistentCapitalization.java b/core/src/main/java/com/google/errorprone/bugpatterns/InconsistentCapitalization.java index eb98130b45f..f7b0f27be9f 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/InconsistentCapitalization.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/InconsistentCapitalization.java @@ -169,7 +169,7 @@ public Void visitVariable(VariableTree tree, Void unused) { && ASTHelpers.enclosingClass(symbol).equals(classSymbol)) { fields.add(symbol); } - return super.visitVariable(tree, unused); + return super.visitVariable(tree, null); } } @@ -209,7 +209,7 @@ public Void visitMethod(MethodTree tree, Void unused) { public Void visitVariable(VariableTree tree, Void unused) { Symbol symbol = ASTHelpers.getSymbol(tree); if (!symbol.getKind().equals(ElementKind.PARAMETER)) { - return super.visitVariable(tree, unused); + return super.visitVariable(tree, null); } String variableName = symbol.toString(); Symbol matchedField = fields.get(Ascii.toLowerCase(variableName)); @@ -219,7 +219,7 @@ public Void visitVariable(VariableTree tree, Void unused) { matchedParameters.put(getCurrentPath(), matchedField); } } - return super.visitVariable(tree, unused); + return super.visitVariable(tree, null); } } } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/JUnit4TestsNotRunWithinEnclosed.java b/core/src/main/java/com/google/errorprone/bugpatterns/JUnit4TestsNotRunWithinEnclosed.java index 7f85c99a15c..dcb37237f69 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/JUnit4TestsNotRunWithinEnclosed.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/JUnit4TestsNotRunWithinEnclosed.java @@ -96,7 +96,7 @@ public Void visitClass(ClassTree classTree, Void unused) { .build())); } } - return super.visitClass(classTree, unused); + return super.visitClass(classTree, null); } }.scan(tree, null); return Description.NO_MATCH; diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/LambdaFunctionalInterface.java b/core/src/main/java/com/google/errorprone/bugpatterns/LambdaFunctionalInterface.java index af7fca37beb..0f7c7a44f30 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/LambdaFunctionalInterface.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/LambdaFunctionalInterface.java @@ -199,7 +199,7 @@ public Void visitMethodInvocation(MethodInvocationTree callTree, Void unused) { callTree.getMethodSelect(), receiverSym.name + "." + apply); } } - return super.visitMethodInvocation(callTree, unused); + return super.visitMethodInvocation(callTree, null); } }, null); @@ -250,7 +250,7 @@ public Void visitMethodInvocation(MethodInvocationTree callTree, Void unused) { if (sym.equals(methodSymbol)) { methodMap.put(methodSymbol.toString(), callTree); } - return super.visitMethodInvocation(callTree, unused); + return super.visitMethodInvocation(callTree, null); } }, null); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/LockOnBoxedPrimitive.java b/core/src/main/java/com/google/errorprone/bugpatterns/LockOnBoxedPrimitive.java index 6f72edf5c55..71944c21b37 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/LockOnBoxedPrimitive.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/LockOnBoxedPrimitive.java @@ -111,7 +111,7 @@ public Void visitSynchronized(SynchronizedTree node, Void aVoid) { if (lock.equals(getSymbol(expression))) { fix.replace(expression, lockName); } - return super.visitSynchronized(node, aVoid); + return super.visitSynchronized(node, null); } }.scan(state.getPath().getCompilationUnit(), null); return fix.build(); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/LoopConditionChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/LoopConditionChecker.java index 4881bf67e96..4b5959c78e8 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/LoopConditionChecker.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/LoopConditionChecker.java @@ -169,25 +169,25 @@ public Void visitUnary(UnaryTree tree, Void unused) { break; default: // fall out } - return super.visitUnary(tree, unused); + return super.visitUnary(tree, null); } @Override public Void visitMethodInvocation(MethodInvocationTree tree, Void unused) { check(ASTHelpers.getReceiver(tree)); - return super.visitMethodInvocation(tree, unused); + return super.visitMethodInvocation(tree, null); } @Override public Void visitAssignment(AssignmentTree tree, Void unused) { check(tree.getVariable()); - return super.visitAssignment(tree, unused); + return super.visitAssignment(tree, null); } @Override public Void visitCompoundAssignment(CompoundAssignmentTree tree, Void unused) { check(tree.getVariable()); - return super.visitCompoundAssignment(tree, unused); + return super.visitCompoundAssignment(tree, null); } private void check(ExpressionTree expression) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/LoopOverCharArray.java b/core/src/main/java/com/google/errorprone/bugpatterns/LoopOverCharArray.java index da756d1e1db..24d82105475 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/LoopOverCharArray.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/LoopOverCharArray.java @@ -86,7 +86,7 @@ public Void visitIdentifier(IdentifierTree node, Void unused) { if (node.getName().contentEquals("i")) { result[0] = true; } - return super.visitIdentifier(node, unused); + return super.visitIdentifier(node, null); } }.scan(tree, null); return result[0]; diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java b/core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java index 08ad96fbc5d..522a4bc442f 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java @@ -212,13 +212,13 @@ private SuggestedFix fixQualifiers(VisitorState state, MethodSymbol sym, Suggest @Override public Void visitMemberSelect(MemberSelectTree tree, Void unused) { fixQualifier(tree, tree.getExpression()); - return super.visitMemberSelect(tree, unused); + return super.visitMemberSelect(tree, null); } @Override public Void visitMemberReference(MemberReferenceTree tree, Void unused) { fixQualifier(tree, tree.getQualifierExpression()); - return super.visitMemberReference(tree, unused); + return super.visitMemberReference(tree, null); } private void fixQualifier(Tree tree, ExpressionTree qualifierExpression) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MissingSuperCall.java b/core/src/main/java/com/google/errorprone/bugpatterns/MissingSuperCall.java index 46d2d5ac7fc..b5d1b22f716 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/MissingSuperCall.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/MissingSuperCall.java @@ -194,7 +194,7 @@ public Boolean visitMethodInvocation(MethodInvocationTree tree, Void unused) { ASTHelpers.isSuper(memberSelect.getExpression()) && memberSelect.getIdentifier().contentEquals(overridingMethodName); } - return result || super.visitMethodInvocation(tree, unused); + return result || super.visitMethodInvocation(tree, null); } @Override diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MixedMutabilityReturnType.java b/core/src/main/java/com/google/errorprone/bugpatterns/MixedMutabilityReturnType.java index 2ec38843e2d..fe7151e95fd 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/MixedMutabilityReturnType.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/MixedMutabilityReturnType.java @@ -181,7 +181,7 @@ && getType(initializer).getKind() != TypeKind.NULL mutable.add(symbol); } } - return super.visitVariable(variableTree, unused); + return super.visitVariable(variableTree, null); } } @@ -202,7 +202,7 @@ private ReturnTypesScanner( @Override public Void visitMethod(MethodTree methodTree, Void unused) { if (!RETURNS_COLLECTION.matches(methodTree.getReturnType(), state)) { - return super.visitMethod(methodTree, unused); + return super.visitMethod(methodTree, null); } MethodScanner scanner = new MethodScanner(); scanner.scan(getCurrentPath(), null); @@ -219,7 +219,7 @@ public Void visitMethod(MethodTree methodTree, Void unused) { state)) .build()); } - return super.visitMethod(methodTree, unused); + return super.visitMethod(methodTree, null); } private final class MethodScanner extends TreePathScanner { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ModifiedButNotUsed.java b/core/src/main/java/com/google/errorprone/bugpatterns/ModifiedButNotUsed.java index e2d8fb5f756..4ebaadab1fa 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/ModifiedButNotUsed.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/ModifiedButNotUsed.java @@ -218,7 +218,7 @@ public Void visitAssignment(AssignmentTree node, Void unused) { if (symbol.equals(getSymbol(node.getVariable()))) { initializers.add(new TreePath(getCurrentPath(), node.getExpression())); } - return super.visitAssignment(node, unused); + return super.visitAssignment(node, null); } }.scan(state.getPath().getParentPath(), null); } else { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/PreferredInterfaceType.java b/core/src/main/java/com/google/errorprone/bugpatterns/PreferredInterfaceType.java index 4143a64b8b9..6d31efdad87 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/PreferredInterfaceType.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/PreferredInterfaceType.java @@ -175,13 +175,13 @@ public Void visitReturn(ReturnTree node, Void unused) { if (method != null) { symbolsToType.put(method, getType(node.getExpression())); } - return super.visitReturn(node, unused); + return super.visitReturn(node, null); } @Override public Void visitLambdaExpression(LambdaExpressionTree node, Void unused) { currentMethod.addLast(null); - super.visitLambdaExpression(node, unused); + super.visitLambdaExpression(node, null); currentMethod.removeLast(); return null; } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ToStringReturnsNull.java b/core/src/main/java/com/google/errorprone/bugpatterns/ToStringReturnsNull.java index 3b35d30af94..14e4d4d42db 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/ToStringReturnsNull.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/ToStringReturnsNull.java @@ -79,7 +79,7 @@ public Boolean scan(Tree tree, Void unused) { return true; case PARENTHESIZED: case CONDITIONAL_EXPRESSION: - return super.scan(tree, unused); + return super.scan(tree, null); default: return false; } @@ -90,7 +90,7 @@ public Boolean scan(Tree tree, Void unused) { private abstract static class BooleanScanner extends TreeScanner { @Override public Boolean scan(Tree tree, Void unused) { - return Boolean.TRUE.equals(super.scan(tree, unused)); + return Boolean.TRUE.equals(super.scan(tree, null)); } @Override diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAsync.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAsync.java index 29b9c176779..748e12704c3 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAsync.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAsync.java @@ -86,7 +86,7 @@ public Void visitMethod(MethodTree tree, Void unused) { lambdaDepth++; var ret = super.visitMethod(tree, null); lambdaDepth--; - return ret; + return null; } @Override @@ -94,7 +94,7 @@ public Void visitLambdaExpression(LambdaExpressionTree tree, Void unused) { lambdaDepth++; var ret = super.visitLambdaExpression(tree, null); lambdaDepth--; - return ret; + return null; } @Override diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryBoxedVariable.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryBoxedVariable.java index 9dad59d75fa..a429ea2c7c3 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryBoxedVariable.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryBoxedVariable.java @@ -336,19 +336,19 @@ public Void scan(Tree tree, Void unused) { if (boxedUsageFound.contains(symbol)) { return null; } - return super.scan(tree, unused); + return super.scan(tree, null); } @Override public Void visitAssignment(AssignmentTree node, Void unused) { Symbol nodeSymbol = getSymbol(node.getVariable()); if (!isBoxed(nodeSymbol, state)) { - return super.visitAssignment(node, unused); + return super.visitAssignment(node, null); } // The variable of interest is being assigned. Check if the expression is non-primitive, // and go on to scan the expression. if (!checkAssignmentExpression(node.getExpression())) { - return scan(node.getExpression(), unused); + return scan(node.getExpression(), null); } boxedUsageFound.add((VarSymbol) nodeSymbol); @@ -379,14 +379,14 @@ public Void visitIdentifier(IdentifierTree node, Void unused) { return null; } } - return super.visitIdentifier(node, unused); + return super.visitIdentifier(node, null); } @Override public Void visitCompoundAssignment(CompoundAssignmentTree node, Void unused) { // Don't count the LHS of compound assignments as boxed usages, because they have to be // unboxed. Just visit the expression. - return scan(node.getExpression(), unused); + return scan(node.getExpression(), null); } @Override @@ -416,14 +416,14 @@ public Void visitMethodInvocation(MethodInvocationTree node, Void unused) { return null; } - return super.visitMethodInvocation(node, unused); + return super.visitMethodInvocation(node, null); } @Override public Void visitReturn(ReturnTree node, Void unused) { Symbol nodeSymbol = getSymbol(ASTHelpers.stripParentheses(node.getExpression())); if (!isBoxed(nodeSymbol, state)) { - return super.visitReturn(node, unused); + return super.visitReturn(node, null); } dereferenced.add((VarSymbol) nodeSymbol); @@ -452,7 +452,7 @@ public Void visitMemberReference(MemberReferenceTree node, Void unused) { return null; } } - return super.visitMemberReference(node, unused); + return super.visitMemberReference(node, null); } } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryLambda.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryLambda.java index 1cad68ba121..46a81029ff0 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryLambda.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryLambda.java @@ -230,7 +230,7 @@ public Void visitMemberSelect(MemberSelectTree node, Void unused) { // We're not smart enough to rewrite a recursive lambda. fixable = false; } - return super.visitMemberSelect(node, unused); + return super.visitMemberSelect(node, null); } private void check(MethodInvocationTree node) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryStringBuilder.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryStringBuilder.java index c09e011b86d..15219e14e14 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryStringBuilder.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryStringBuilder.java @@ -159,7 +159,7 @@ public Void visitIdentifier(IdentifierTree tree, Void unused) { ok[0] = false; } } - return super.visitIdentifier(tree, unused); + return super.visitIdentifier(tree, null); } }.scan(state.getPath().getCompilationUnit(), null); return ok[0]; diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryTestMethodPrefix.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryTestMethodPrefix.java index fe77ac90f8f..dbf4e3acd6c 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryTestMethodPrefix.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryTestMethodPrefix.java @@ -51,16 +51,16 @@ public Description matchCompilationUnit(CompilationUnitTree tree, VisitorState s @Override public Void visitMethod(MethodTree tree, Void unused) { if (!TEST.matches(tree, state)) { - return super.visitMethod(tree, unused); + return super.visitMethod(tree, null); } String name = tree.getName().toString(); if (!name.startsWith("test") || name.equals("test")) { - return super.visitMethod(tree, unused); + return super.visitMethod(tree, null); } var newName = toLowerCase(name.charAt(4)) + name.substring(5); fixBuilder.merge(renameMethod(tree, newName, state)); sites.add(tree); - return super.visitMethod(tree, unused); + return super.visitMethod(tree, null); } }.scan(state.getPath(), null); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java index 1ed58eb23cb..ebab420c169 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java @@ -220,7 +220,7 @@ public Void visitMethod(MethodTree tree, Void unused) { if (isMethodSymbolEligibleForChecking(tree, classesMadeVisible)) { unusedMethods.put(getSymbol(tree), getCurrentPath()); } - return super.visitMethod(tree, unused); + return super.visitMethod(tree, null); } private boolean hasJUnitParamsParametersForMethodAnnotation( @@ -340,7 +340,7 @@ public Void visitNewClass(NewClassTree tree, Void unused) { @Override public Void visitAssignment(AssignmentTree tree, Void unused) { handle(getSymbol(tree.getVariable())); - return super.visitAssignment(tree, unused); + return super.visitAssignment(tree, null); } private void handle(Symbol symbol) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedTypeParameter.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedTypeParameter.java index 32221134d03..daf973490b9 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedTypeParameter.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedTypeParameter.java @@ -94,7 +94,7 @@ public Void scan(Tree tree, Void unused) { if (symbol instanceof TypeVariableSymbol) { identifiers.add((TypeVariableSymbol) symbol); } - return super.scan(tree, unused); + return super.scan(tree, null); } }.scan(tree, null); return identifiers.build(); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java index 8b0204b36a9..cec249ef709 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java @@ -769,7 +769,7 @@ public Void visitMethod(MethodTree tree, Void unused) { if (SERIALIZATION_METHODS.matches(tree, state)) { return scan(tree.getBody(), null); } - return isSuppressed(tree, state) ? null : super.visitMethod(tree, unused); + return isSuppressed(tree, state) ? null : super.visitMethod(tree, null); } } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/android/WakelockReleasedDangerously.java b/core/src/main/java/com/google/errorprone/bugpatterns/android/WakelockReleasedDangerously.java index 143c576e690..b48e9fb7b05 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/android/WakelockReleasedDangerously.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/android/WakelockReleasedDangerously.java @@ -206,7 +206,7 @@ public Void visitMethodInvocation(MethodInvocationTree callTree, Void unused) { MethodSymbol methodSymbol = getSymbol(callTree); methodMap.put(methodSymbol.getSimpleName().toString(), callTree); } - return super.visitMethodInvocation(callTree, unused); + return super.visitMethodInvocation(callTree, null); } }, null); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/argumentselectiondefects/CreatesDuplicateCallHeuristic.java b/core/src/main/java/com/google/errorprone/bugpatterns/argumentselectiondefects/CreatesDuplicateCallHeuristic.java index 99fcd66b9b4..409c3dc5544 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/argumentselectiondefects/CreatesDuplicateCallHeuristic.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/argumentselectiondefects/CreatesDuplicateCallHeuristic.java @@ -89,13 +89,13 @@ private static ImmutableList> findArgumentsForOtherInstances( @Override public Void visitMethodInvocation(MethodInvocationTree methodInvocationTree, Void unused) { addToResult(ASTHelpers.getSymbol(methodInvocationTree), methodInvocationTree); - return super.visitMethodInvocation(methodInvocationTree, unused); + return super.visitMethodInvocation(methodInvocationTree, null); } @Override public Void visitNewClass(NewClassTree newClassTree, Void unused) { addToResult(ASTHelpers.getSymbol(newClassTree), newClassTree); - return super.visitNewClass(newClassTree, unused); + return super.visitNewClass(newClassTree, null); } @Override @@ -109,7 +109,7 @@ public Void visitMethod(MethodTree methodTree, Void unused) { ASTHelpers.findSuperMethods(methodSymbol, state.getTypes())) { addToResult(superSymbol, methodTree); } - return super.visitMethod(methodTree, unused); + return super.visitMethod(methodTree, null); } private void addToResult(MethodSymbol foundSymbol, Tree tree) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/ApiFactory.java b/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/ApiFactory.java index 93dfbbebfc7..28705ec8363 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/ApiFactory.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/ApiFactory.java @@ -59,13 +59,13 @@ public Type visitType(Type t, Void unused) { @Override public Type visitClassType(Type.ClassType t, Void unused) { - return super.visitClassType((Type.ClassType) cloneWithoutMetadata(t), unused); + return super.visitClassType((Type.ClassType) cloneWithoutMetadata(t), null); } // Remove annotations from all enclosing containers @Override public Type visitArrayType(Type.ArrayType t, Void unused) { - return super.visitArrayType((Type.ArrayType) cloneWithoutMetadata(t), unused); + return super.visitArrayType((Type.ArrayType) cloneWithoutMetadata(t), null); } }; diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/NoCanIgnoreReturnValueOnClasses.java b/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/NoCanIgnoreReturnValueOnClasses.java index 94cde1e2fab..ccbcee79b9c 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/NoCanIgnoreReturnValueOnClasses.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/NoCanIgnoreReturnValueOnClasses.java @@ -111,7 +111,7 @@ public Description matchClass(ClassTree tree, VisitorState state) { @Override public Void visitClass(ClassTree classTree, Void unused) { // stop descending when we reach a class that's marked @CRV - return hasAnnotation(classTree, CRV, state) ? null : super.visitClass(classTree, unused); + return hasAnnotation(classTree, CRV, state) ? null : super.visitClass(classTree, null); } @Override diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/formatstring/StrictFormatStringValidation.java b/core/src/main/java/com/google/errorprone/bugpatterns/formatstring/StrictFormatStringValidation.java index a9bf768ee66..b0c3f6894d5 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/formatstring/StrictFormatStringValidation.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/formatstring/StrictFormatStringValidation.java @@ -211,7 +211,7 @@ public ValidationResult visitVariable(VariableTree node, Void unused) { } return validateStringFromAssignment(node, node.getInitializer(), args, state); } - return super.visitVariable(node, unused); + return super.visitVariable(node, null); } @Nullable diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/InlinabilityResult.java b/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/InlinabilityResult.java index 5b33b21c5c9..d511bf72863 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/InlinabilityResult.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/InlinabilityResult.java @@ -229,7 +229,7 @@ public Void visitIdentifier(IdentifierTree identifierTree, Void aVoid) { if (parameterVariables.contains(usedSymbol) && !usedVariables.add(usedSymbol)) { usesVarsTwice.set(usedSymbol); } - return super.visitIdentifier(identifierTree, aVoid); + return super.visitIdentifier(identifierTree, null); } }.scan(new TreePath(state.getPath(), body), null); return usesVarsTwice.get(); @@ -244,7 +244,7 @@ private static boolean usesVarargsParamPoorly( @Override public Void visitIdentifier(IdentifierTree identifierTree, Void aVoid) { if (!getSymbol(identifierTree).equals(varargsParam)) { - return super.visitIdentifier(identifierTree, aVoid); + return super.visitIdentifier(identifierTree, null); } Tree parentNode = getCurrentPath().getParentPath().getLeaf(); if (!(parentNode instanceof MethodInvocationTree)) { @@ -262,7 +262,7 @@ public Void visitIdentifier(IdentifierTree identifierTree, Void aVoid) { List args = mit.getArguments(); if (args.isEmpty()) { // buh! confusing. - return super.visitIdentifier(identifierTree, aVoid); + return super.visitIdentifier(identifierTree, null); } int indexOfThisTreeUse = args.indexOf(identifierTree); @@ -272,7 +272,7 @@ public Void visitIdentifier(IdentifierTree identifierTree, Void aVoid) { return null; } - return super.visitIdentifier(identifierTree, aVoid); + return super.visitIdentifier(identifierTree, null); } }.scan(new TreePath(state.getPath(), expressionTree), null); return usesVarargsPoorly.get(); @@ -296,7 +296,7 @@ public Void visitMemberSelect(MemberSelectTree memberSelectTree, Void aVoid) { // short circuit return null; } - return super.visitMemberSelect(memberSelectTree, aVoid); + return super.visitMemberSelect(memberSelectTree, null); } @Override @@ -316,7 +316,7 @@ public Void visitNewClass(NewClassTree newClassTree, Void aVoid) { if (isDeprecatedOrLessVisible(newClassTree, minVisibility)) { return null; } - return super.visitNewClass(newClassTree, aVoid); + return super.visitNewClass(newClassTree, null); } @Override diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/InlineMeData.java b/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/InlineMeData.java index fae0792f2a5..3ceed8260cf 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/InlineMeData.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/InlineMeData.java @@ -185,7 +185,7 @@ public QualifyingTreeCopier( @Override public JCTree visitLambdaExpression(LambdaExpressionTree lambdaExpressionTree, Void unused) { JCLambda expr = (JCLambda) lambdaExpressionTree; - JCLambda lambda = (JCLambda) super.visitLambdaExpression(lambdaExpressionTree, unused); + JCLambda lambda = (JCLambda) super.visitLambdaExpression(lambdaExpressionTree, null); lambda.paramKind = expr.paramKind; return lambda; } @@ -196,7 +196,7 @@ public JCTree visitIdentifier(IdentifierTree identifierTree, Void unused) { return treeMaker.Select( qualifications.get(identifierTree), state.getName(identifierTree.toString())); } - return super.visitIdentifier(identifierTree, unused); + return super.visitIdentifier(identifierTree, null); } } @@ -290,16 +290,16 @@ private void addImport(String clazzName) { @Override public Void visitIdentifier(IdentifierTree identifierTree, Void unused) { if (identifierTree.getName().contentEquals("this")) { - return super.visitIdentifier(identifierTree, unused); + return super.visitIdentifier(identifierTree, null); } Symbol symbol = getSymbol(identifierTree); if (symbol == null || ASTHelpers.isLocal(symbol)) { - return super.visitIdentifier(identifierTree, unused); + return super.visitIdentifier(identifierTree, null); } Tree parentNode = getCurrentPath().getParentPath().getLeaf(); if (nameUsageDoesntRequireQualificationOrImport(parentNode)) { - return super.visitIdentifier(identifierTree, unused); + return super.visitIdentifier(identifierTree, null); } // TODO(glorioso): This suggestion has the following behavior: @@ -333,7 +333,7 @@ public Void visitIdentifier(IdentifierTree identifierTree, Void unused) { addImport(symbol.getQualifiedName().toString()); } } - return super.visitIdentifier(identifierTree, unused); + return super.visitIdentifier(identifierTree, null); } private boolean isMemberOfThisClass(Symbol symbol, Tree parentNode) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/javadoc/UrlInSee.java b/core/src/main/java/com/google/errorprone/bugpatterns/javadoc/UrlInSee.java index fa46653c1d2..f8baa928dfb 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/javadoc/UrlInSee.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/javadoc/UrlInSee.java @@ -87,7 +87,7 @@ public Void visitErroneous(ErroneousTree erroneousTree, Void unused) { replace( erroneousTree, erroneousTree.getBody().replaceFirst("@see", "See"), state))); } - return super.visitErroneous(erroneousTree, unused); + return super.visitErroneous(erroneousTree, null); } } } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/EqualsBrokenForNull.java b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/EqualsBrokenForNull.java index c043cc42ae6..0f00940fa6d 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/EqualsBrokenForNull.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/EqualsBrokenForNull.java @@ -118,7 +118,7 @@ public Void visitIf(IfTree ifTree, Void unused) { if (condition instanceof IdentifierTree && impliesNonNull.contains(getSymbol(condition))) { return scan(ifTree.getElseStatement(), null); } - return super.visitIf(ifTree, unused); + return super.visitIf(ifTree, null); } @Override diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullnessUtils.java b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullnessUtils.java index c65fbaaa626..7bbd97cddbc 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullnessUtils.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullnessUtils.java @@ -505,39 +505,39 @@ static boolean hasDefinitelyNullBranch( return new SimpleTreeVisitor() { @Override public Boolean visitAssignment(AssignmentTree tree, Void unused) { - return visit(tree.getExpression(), unused); + return visit(tree.getExpression(), null); } @Override public Boolean visitConditionalExpression(ConditionalExpressionTree tree, Void unused) { - return visit(tree.getTrueExpression(), unused) - || visit(tree.getFalseExpression(), unused) + return visit(tree.getTrueExpression(), null) + || visit(tree.getFalseExpression(), null) || isTernaryXIfXIsNull(tree); } @Override public Boolean visitIdentifier(IdentifierTree tree, Void unused) { - return super.visitIdentifier(tree, unused) + return super.visitIdentifier(tree, null) || varsProvenNullByParentIf.contains(tree.getName()); } @Override public Boolean visitMethodInvocation(MethodInvocationTree tree, Void unused) { - return super.visitMethodInvocation(tree, unused) + return super.visitMethodInvocation(tree, null) || isOptionalOrNull(tree) || isStringsEmptyToNull(tree); } @Override public Boolean visitParenthesized(ParenthesizedTree tree, Void unused) { - return visit(tree.getExpression(), unused); + return visit(tree.getExpression(), null); } // For visitSwitchExpression logic, see defaultAction. @Override public Boolean visitTypeCast(TypeCastTree tree, Void unused) { - return visit(tree.getExpression(), unused); + return visit(tree.getExpression(), null); } @Override diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/ParameterMissingNullable.java b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/ParameterMissingNullable.java index 4759a7e3990..2d2925e8149 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/ParameterMissingNullable.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/ParameterMissingNullable.java @@ -211,7 +211,7 @@ private static boolean nullCheckLikelyToProduceException(VisitorState state) { public Void visitNewClass(NewClassTree tree, Void unused) { likelyToProduceException[0] |= state.getTypes().isSubtype(getType(tree), state.getSymtab().throwableType); - return super.visitNewClass(tree, unused); + return super.visitNewClass(tree, null); } @Override diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/ReturnMissingNullable.java b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/ReturnMissingNullable.java index 2d1525c09d3..1ec82ff5c26 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/ReturnMissingNullable.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/ReturnMissingNullable.java @@ -221,7 +221,7 @@ public Description matchCompilationUnit( @Override public Void visitVariable(VariableTree tree, Void unused) { doVisitVariable(tree); - return super.visitVariable(tree, unused); + return super.visitVariable(tree, null); } void doVisitVariable(VariableTree tree) { @@ -267,7 +267,7 @@ && constValue( @Override public Void visitMethod(MethodTree tree, Void unused) { doVisitMethod(tree); - return super.visitMethod(tree, unused); + return super.visitMethod(tree, null); } void doVisitMethod(MethodTree tree) { @@ -334,7 +334,7 @@ && getOnlyElement(tree.getBody().getStatements()).getKind() == THROW) { @Override public Void visitReturn(ReturnTree tree, Void unused) { doVisitReturn(tree); - return super.visitReturn(tree, unused); + return super.visitReturn(tree, null); } void doVisitReturn(ReturnTree returnTree) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/UnnecessaryCheckNotNull.java b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/UnnecessaryCheckNotNull.java index 8801174c2e8..356aa9e3a9a 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/UnnecessaryCheckNotNull.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/UnnecessaryCheckNotNull.java @@ -236,7 +236,7 @@ public Void visitIdentifier(IdentifierTree node, Void v) { if (((JCIdent) node).sym instanceof VarSymbol) { freeVars.add(node); } - return super.visitIdentifier(node, v); + return super.visitIdentifier(node, null); } }.scan(tree, null); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/time/NearbyCallers.java b/core/src/main/java/com/google/errorprone/bugpatterns/time/NearbyCallers.java index 98a3646f9d9..73dad8d7629 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/time/NearbyCallers.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/time/NearbyCallers.java @@ -89,7 +89,7 @@ public Boolean visitLambdaExpression(LambdaExpressionTree node, Void unused) { @Override public Boolean visitMethodInvocation(MethodInvocationTree secondaryMethod, Void unused) { - if (super.visitMethodInvocation(secondaryMethod, unused)) { + if (super.visitMethodInvocation(secondaryMethod, null)) { return true; } if (secondaryMethod == null diff --git a/core/src/main/java/com/google/errorprone/refaster/UUnary.java b/core/src/main/java/com/google/errorprone/refaster/UUnary.java index cfc12c130ed..64109c7b637 100644 --- a/core/src/main/java/com/google/errorprone/refaster/UUnary.java +++ b/core/src/main/java/com/google/errorprone/refaster/UUnary.java @@ -91,7 +91,7 @@ public T copy(T t, Void v) { if (t instanceof BinaryTree || t instanceof UnaryTree || t instanceof ConditionalExpressionTree) { - return super.copy(t, v); + return super.copy(t, null); } else { return (T) defaultNegation(t); } diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/BugCheckerTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/BugCheckerTest.java index 5e3fce12ba5..c678d3d2320 100644 --- a/core/src/test/java/com/google/errorprone/bugpatterns/BugCheckerTest.java +++ b/core/src/test/java/com/google/errorprone/bugpatterns/BugCheckerTest.java @@ -303,7 +303,7 @@ public Void scan(Tree tree, Void unused) { if (isSuppressed(tree, state())) { return null; } - return super.scan(tree, unused); + return super.scan(tree, null); } @Override @@ -311,7 +311,7 @@ public Void scan(TreePath path, Void unused) { if (isSuppressed(path.getLeaf(), stateForCompilationUnit.withPath(path))) { return null; } - return super.scan(path, unused); + return super.scan(path, null); } @Override