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

JSpecify: fix crash with calls to static methods #856

Merged
merged 6 commits into from
Nov 8, 2023
Merged

JSpecify: fix crash with calls to static methods #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
25963a9
Adding com.google.common to annotatedpackages and fixing the NPE we g…
akulk022 Nov 7, 2023
ffb680e
Adding scenario for ImmutableSet.Of() with a param to the test case t…
akulk022 Nov 7, 2023
fff179d
Merge branch 'master' into jspecify_buildWithNullAway_guava_issue_abh…
msridhar Nov 8, 2023
f04f43c
changing the test case to be generic for static method calls instead …
akulk022 Nov 8, 2023
0d1c44f
Merge remote-tracking branch 'origin/jspecify_buildWithNullAway_guava…
akulk022 Nov 8, 2023
54bc881
Removing com.google.common from annotated packages to add in a future…
akulk022 Nov 8, 2023
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
4 changes: 2 additions & 2 deletions nullaway/src/main/java/com/uber/nullaway/GenericsChecks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ public static Nullness getGenericReturnNullnessAtInvocation(
MethodInvocationTree tree,
VisitorState state,
Config config) {
if (!(tree.getMethodSelect() instanceof MemberSelectTree)) {
if (!(tree.getMethodSelect() instanceof MemberSelectTree) || invokedMethodSymbol.isStatic()) {
return Nullness.NONNULL;
}
Type methodReceiverType =
Expand Down Expand Up @@ -834,7 +834,7 @@ public static Nullness getGenericParameterNullnessAtInvocation(
MethodInvocationTree tree,
VisitorState state,
Config config) {
if (!(tree.getMethodSelect() instanceof MemberSelectTree)) {
if (!(tree.getMethodSelect() instanceof MemberSelectTree) || invokedMethodSymbol.isStatic()) {
return Nullness.NONNULL;
}
Type enclosingType =
Expand Down
28 changes: 28 additions & 0 deletions nullaway/src/test/java/com/uber/nullaway/NullAwayJSpecifyGenericsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1494,6 +1494,34 @@ public void interactionWithContracts() {
.doTest();
}

@Test
public void testForStaticMethodCallAsAParam() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@akulk022 have you confirmed that this test fails with two unexpected errors if you remove the fixes in GenericsChecks?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I verified it for both scenarios by removing the fix and seeing if the test case fails with the same exception as before.

makeHelper()
.addSourceLines(
"Test.java",
"package com.uber;",
"import org.jspecify.annotations.Nullable;",
"class Test {",
" static class A<T> {",
" public static <T> A<T> returnA(){",
" return new A<T>();",
" }",
" public static <T> A<T> returnAWithParam(Object o){",
" return new A<T>();",
" }",
" }",
" static void func(A<Object> a){",
" }",
" static void testNegative() {",
" func(A.returnA());",
" }",
" static void testNegative2() {",
" func(A.returnAWithParam(new Object()));",
" }",
"}")
.doTest();
}

private CompilationTestHelper makeHelper() {
return makeTestHelperWithArgs(
Arrays.asList(
Expand Down