Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,25 @@ private void setUnconditionalArgumentNullness(
AccessPath.AccessPathContext apContext) {
ImmutableSet<Integer> requiredNonNullParameters =
getOptLibraryModels(state.context).failIfNullParameters(callee);
ImmutableSet<Integer> castToNonNullParameters =
getOptLibraryModels(state.context).castToNonNullMethod(callee);
String qualifiedName = ASTHelpers.enclosingClass(callee) + "." + callee.getSimpleName();
boolean isCliCastToNonNull =
qualifiedName.equals(config.getCastToNonNullMethod()) && callee.getParameters().size() == 1;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated

Set<Integer> allNonNullParams;
if (castToNonNullParameters.isEmpty() && !isCliCastToNonNull) {
allNonNullParams = requiredNonNullParameters;
} else {
allNonNullParams = new HashSet<>(requiredNonNullParameters);
allNonNullParams.addAll(castToNonNullParameters);
if (isCliCastToNonNull) {
allNonNullParams.add(0);
}
}

for (AccessPath accessPath :
accessPathsAtIndexes(requiredNonNullParameters, arguments, state, apContext)) {
accessPathsAtIndexes(allNonNullParams, arguments, state, apContext)) {
bothUpdates.set(accessPath, NONNULL);
}
}
Expand Down
25 changes: 25 additions & 0 deletions nullaway/src/test/java/com/uber/nullaway/CoreTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,31 @@ Object test4(@Nullable Object o) {
.doTest();
}

@SuppressWarnings("deprecation")
@Test
public void testCastToNonNullPropagation() {
defaultCompilationHelper
.addSourceFile("testdata/Util.java")
.addSourceLines(
"Test.java",
"""
package com.uber;
import javax.annotation.Nullable;
import static com.uber.nullaway.testdata.Util.castToNonNull;
class Test {
static class Foo {
@Nullable String getToken() { return ""; }
}
void test(Foo value) {
if (castToNonNull(value.getToken()).contains("abc")) {
value.getToken().length();
}
}
}
""")
.doTest();
}

@Test
public void testReadStaticInConstructor() {
defaultCompilationHelper
Expand Down