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

Jump to bottom

Fix for a crash in RedundantSetterCall. #4373

Merged
merged 1 commit into from Apr 24, 2024
Merged

Fix for a crash in RedundantSetterCall. #4373

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/src/main/java/com/google/errorprone/bugpatterns/RedundantSetterCall.java
View file
Open in desktop
Expand Up @@ -29,6 +29,7 @@
import static com.google.errorprone.util.ASTHelpers.getEnclosedElements;
import static com.google.errorprone.util.ASTHelpers.getSymbol;
import static com.google.errorprone.util.ASTHelpers.getType;
import static com.google.errorprone.util.ASTHelpers.getUpperBound;
import static com.google.errorprone.util.ASTHelpers.hasAnnotation;
import static com.google.errorprone.util.ASTHelpers.isAbstract;
import static com.google.errorprone.util.ASTHelpers.isSameType;
Expand Down Expand Up @@ -164,7 +165,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
}

private ImmutableMap<String, OneOfField> scanForOneOfSetters(Type type, VisitorState state) {
var owner = type.tsym.owner;
var owner = getUpperBound(type, state.getTypes()).tsym.owner;
if (owner == null || isSubtype(owner.type, GENERATED_MESSAGE_LITE.get(state), state)) {
return ImmutableMap.of();
}
Expand Down
15 changes: 15 additions & 0 deletions core/src/test/java/com/google/errorprone/bugpatterns/RedundantSetterCallTest.java
View file
Open in desktop
Expand Up @@ -223,4 +223,19 @@ public void autovalue() {
"}")
.doTest();
}

@Test
public void builderOfWildcardType_noFindings() {
compilationHelper
.addSourceLines(
"Test.java",
"import com.google.protobuf.Descriptors.FieldDescriptor;",
"import com.google.protobuf.GeneratedMessage.Builder;",
"class Test {",
" public void clear(final Builder<?> builder, FieldDescriptor fieldDescriptor) {",
" builder.clearField(fieldDescriptor);",
" }",
"}")
.doTest();
}
}