Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hardcode BoxedPrimitiveEquality:ExemptStaticConstants = false. #4907

Merged
merged 1 commit into from
Mar 17, 2025
+2 −27
Merged

Hardcode BoxedPrimitiveEquality:ExemptStaticConstants = false. #4907

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 2 additions & 27 deletions core/src/main/java/com/google/errorprone/bugpatterns/BoxedPrimitiveEquality.java
View file
Original file line number Diff line number Diff line change
@@ -17,17 +17,11 @@
package com.google.errorprone.bugpatterns;

import static com.google.errorprone.BugPattern.SeverityLevel.ERROR;
import static com.google.errorprone.util.ASTHelpers.getSymbol;
import static com.google.errorprone.util.ASTHelpers.getType;
import static com.google.errorprone.util.ASTHelpers.isStatic;

import com.google.errorprone.BugPattern;
import com.google.errorprone.ErrorProneFlags;
import com.google.errorprone.VisitorState;
import com.sun.source.tree.ExpressionTree;
import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Symbol.VarSymbol;
import com.sun.tools.javac.code.Type;
import javax.inject.Inject;

@@ -40,35 +34,16 @@
altNames = {"NumericEquality"},
severity = ERROR)
public final class BoxedPrimitiveEquality extends AbstractReferenceEquality {
private final boolean exemptStaticConstants;

@Inject
BoxedPrimitiveEquality(ErrorProneFlags flags) {
this.exemptStaticConstants =
flags.getBoolean("BoxedPrimitiveEquality:ExemptStaticConstants").orElse(false);
}
BoxedPrimitiveEquality() {}

@Override
protected boolean matchArgument(ExpressionTree tree, VisitorState state) {
var type = getType(tree);
if (type == null || !isRelevantType(type, state)) {
return false;
}

// Using a static final field as a sentinel is OK
// TODO(cushon): revisit this assumption carried over from NumericEquality
return !(exemptStaticConstants && isStaticConstant(getSymbol(tree)));
return type != null && isRelevantType(type, state);
}

private boolean isRelevantType(Type type, VisitorState state) {
return !type.isPrimitive() && state.getTypes().unboxedType(type).isPrimitive();
}

private static boolean isStaticConstant(Symbol sym) {
return sym instanceof VarSymbol && isFinal(sym) && isStatic(sym);
}

public static boolean isFinal(Symbol s) {
return (s.flags() & Flags.FINAL) == Flags.FINAL;
}
}