Skip to content

Commit 99e5032

Browse files
committed
SONARJAVA-7236 Leave a call unresolved when no method takes that many arguments
1 parent 9710553 commit 99e5032

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

‎java-frontend/src/main/java/org/sonar/java/model/JSema.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,13 @@ Symbol.MethodSymbol declaredMethod(String ownerFqn, String name, List<Type> argu
11331133
if (sameArity.size() == 1) {
11341134
return sameArity.get(0);
11351135
}
1136-
return candidates.size() == 1 ? candidates.get(0) : null;
1136+
return null;
1137+
}
1138+
1139+
/** ECJ leaves a call unresolved when no declaration takes this many arguments, rather than guessing one. */
1140+
static boolean arityMatches(Symbol.MethodSymbol method, int argumentCount) {
1141+
int parameters = method.parameterTypes().size();
1142+
return method.isVarArgsMethod() ? argumentCount >= parameters - 1 : argumentCount == parameters;
11371143
}
11381144

11391145
/** The single abstract method of {@code type} when it is a functional interface, else null. */

‎java-frontend/src/main/java/org/sonar/java/model/SemsitterTranslator.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1866,6 +1866,9 @@ private MethodInvocationTreeImpl invocation(Node node) {
18661866
} else if (identifier.symbol() instanceof Symbol.MethodSymbol bound) {
18671867
identifier.symbol = sema.preferOverload(bound, libraryMethod(qualifier, identifier.name(), arguments), arguments);
18681868
}
1869+
if (identifier.symbol instanceof JMethodSymbol method && !method.isUnknown() && !JSema.arityMatches(method, arguments.size())) {
1870+
identifier.symbol = Symbol.MethodSymbol.UNKNOWN_METHOD;
1871+
}
18691872
if (identifier.symbol instanceof JMethodSymbol method) {
18701873
List<Type> parameters = sema.invocationParameters(method, receiver, arguments);
18711874
ascribeArguments(method, parameters, tree.arguments());
@@ -1924,7 +1927,7 @@ private void bindConstructor(NewClassTreeImpl tree, @Nullable Node typeNode) {
19241927
Symbol resolved = sema.resolve(constructor);
19251928
String owner = resolved.owner() == null || resolved.owner().type() == null ? "" : resolved.owner().type().erasure().fullyQualifiedName();
19261929
boolean importedElsewhere = imported != null && sema.declaresType(imported) && !imported.equals(owner);
1927-
if (resolved instanceof Symbol.MethodSymbol method && !importedElsewhere) {
1930+
if (resolved instanceof Symbol.MethodSymbol method && !importedElsewhere && JSema.arityMatches(method, tree.arguments().size())) {
19281931
identifier.symbol = resolved;
19291932
recordUse(resolved, identifier);
19301933
ascribeArguments(method, tree.arguments());
@@ -1938,7 +1941,7 @@ private void bindConstructor(NewClassTreeImpl tree, @Nullable Node typeNode) {
19381941
}
19391942
String owner = tree.classBody() != null && type.symbol().isInterface() ? "java.lang.Object" : type.fullyQualifiedName();
19401943
Symbol.MethodSymbol declared = type.isClass() ? sema.declaredMethod(owner, "<init>", argumentTypes(tree.arguments())) : null;
1941-
if (declared != null) {
1944+
if (declared != null && JSema.arityMatches(declared, tree.arguments().size())) {
19421945
identifier.symbol = declared;
19431946
recordUse(declared, identifier);
19441947
ascribeArguments(declared, tree.arguments());

0 commit comments

Comments
 (0)