Skip to content

Commit 296fb4e

Browse files
graememorganError Prone Team
authored and
Error Prone Team
committed
Hardcode BoxedPrimitiveEquality:ExemptStaticConstants = false.
PiperOrigin-RevId: 737602824
1 parent aee5101 commit 296fb4e

File tree

1 file changed

+2
-27
lines changed

1 file changed

+2
-27
lines changed

core/src/main/java/com/google/errorprone/bugpatterns/BoxedPrimitiveEquality.java

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,11 @@
1717
package com.google.errorprone.bugpatterns;
1818

1919
import static com.google.errorprone.BugPattern.SeverityLevel.ERROR;
20-
import static com.google.errorprone.util.ASTHelpers.getSymbol;
2120
import static com.google.errorprone.util.ASTHelpers.getType;
22-
import static com.google.errorprone.util.ASTHelpers.isStatic;
2321

2422
import com.google.errorprone.BugPattern;
25-
import com.google.errorprone.ErrorProneFlags;
2623
import com.google.errorprone.VisitorState;
2724
import com.sun.source.tree.ExpressionTree;
28-
import com.sun.tools.javac.code.Flags;
29-
import com.sun.tools.javac.code.Symbol;
30-
import com.sun.tools.javac.code.Symbol.VarSymbol;
3125
import com.sun.tools.javac.code.Type;
3226
import javax.inject.Inject;
3327

@@ -40,35 +34,16 @@
4034
altNames = {"NumericEquality"},
4135
severity = ERROR)
4236
public final class BoxedPrimitiveEquality extends AbstractReferenceEquality {
43-
private final boolean exemptStaticConstants;
44-
4537
@Inject
46-
BoxedPrimitiveEquality(ErrorProneFlags flags) {
47-
this.exemptStaticConstants =
48-
flags.getBoolean("BoxedPrimitiveEquality:ExemptStaticConstants").orElse(false);
49-
}
38+
BoxedPrimitiveEquality() {}
5039

5140
@Override
5241
protected boolean matchArgument(ExpressionTree tree, VisitorState state) {
5342
var type = getType(tree);
54-
if (type == null || !isRelevantType(type, state)) {
55-
return false;
56-
}
57-
58-
// Using a static final field as a sentinel is OK
59-
// TODO(cushon): revisit this assumption carried over from NumericEquality
60-
return !(exemptStaticConstants && isStaticConstant(getSymbol(tree)));
43+
return type != null && isRelevantType(type, state);
6144
}
6245

6346
private boolean isRelevantType(Type type, VisitorState state) {
6447
return !type.isPrimitive() && state.getTypes().unboxedType(type).isPrimitive();
6548
}
66-
67-
private static boolean isStaticConstant(Symbol sym) {
68-
return sym instanceof VarSymbol && isFinal(sym) && isStatic(sym);
69-
}
70-
71-
public static boolean isFinal(Symbol s) {
72-
return (s.flags() & Flags.FINAL) == Flags.FINAL;
73-
}
7449
}

0 commit comments

Comments
 (0)