Skip to content

Fix bug with storing library model type variable upper bounds #1687

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

Merged
msridhar merged 3 commits into from
Aug 9, 2026
+29 −9
Merged

Fix bug with storing library model type variable upper bounds #1687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36aa906
Fix bug with storing library model type variable upper bounds
msridhar Aug 8, 2026
4e58a28
comment
msridhar Aug 8, 2026
c338eba
Empty commit for CI
msridhar Aug 8, 2026
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
7 changes: 3 additions & 4 deletions nullaway/src/main/java/com/uber/nullaway/handlers/LibraryModelsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSetMultimap;
import com.google.common.collect.Multimap;
import com.google.common.collect.SetMultimap;
import com.google.errorprone.VisitorState;
import com.google.errorprone.util.ASTHelpers;
Expand Down Expand Up @@ -1669,8 +1668,8 @@ private static class ExternalStubxLibraryModels implements LibraryModels {

private final Map<String, Map<String, Map<Integer, Set<String>>>> argAnnotCache;
private final Set<String> nullMarkedClassesCache;
private final Map<String, Integer> upperBoundsCache;
private final Multimap<String, Integer> methodTypeParamNullableUpperBoundCache;
private final SetMultimap<String, Integer> upperBoundsCache;
private final SetMultimap<String, Integer> methodTypeParamNullableUpperBoundCache;
private final Map<String, SetMultimap<Integer, NestedAnnotationInfo>> nestedAnnotationInfo;

ExternalStubxLibraryModels(boolean isJarInferEnabled, boolean isJSpecifyJDKEnabled) {
Expand Down Expand Up @@ -1746,7 +1745,7 @@ public ImmutableSet<String> nullMarkedClasses() {
public ImmutableSetMultimap<String, Integer> typeVariablesWithNullableUpperBounds() {
ImmutableSetMultimap.Builder<String, Integer> mapBuilder =
new ImmutableSetMultimap.Builder<>();
for (Map.Entry<String, Integer> entry : upperBoundsCache.entrySet()) {
for (Map.Entry<String, Integer> entry : upperBoundsCache.entries()) {
Comment thread
msridhar marked this conversation as resolved.
mapBuilder.put(entry.getKey(), entry.getValue());
}
return mapBuilder.build();
Expand Down
9 changes: 4 additions & 5 deletions nullaway/src/main/java/com/uber/nullaway/handlers/StubxCacheUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Multimap;
import com.google.common.collect.SetMultimap;
import com.uber.nullaway.jarinfer.JarInferStubxProvider;
import com.uber.nullaway.libmodel.NestedAnnotationInfo;
Expand Down Expand Up @@ -71,7 +70,7 @@ private void LOG(boolean cond, String tag, String msg) {

private final Map<String, Map<String, Map<Integer, Set<String>>>> argAnnotCache;

private final Map<String, Integer> upperBoundCache;
private final SetMultimap<String, Integer> upperBoundCache;

private final Set<String> nullMarkedClassesCache;

Expand All @@ -89,7 +88,7 @@ private void LOG(boolean cond, String tag, String msg) {
*/
StubxCacheUtil(String logCaller, boolean loadJarInferModels) {
argAnnotCache = new LinkedHashMap<>();
upperBoundCache = new HashMap<>();
upperBoundCache = HashMultimap.create();
nullMarkedClassesCache = new HashSet<>();
methodTypeParamNullableUpperBoundCache = HashMultimap.create();
nestedAnnotationInfoCache = new HashMap<>();
Expand All @@ -99,15 +98,15 @@ private void LOG(boolean cond, String tag, String msg) {
}
}

public Map<String, Integer> getUpperBoundCache() {
public SetMultimap<String, Integer> getUpperBoundCache() {
return upperBoundCache;
}

public Set<String> getNullMarkedClassesCache() {
return nullMarkedClassesCache;
}

public Multimap<String, Integer> getMethodTypeParamNullableUpperBoundCache() {
public SetMultimap<String, Integer> getMethodTypeParamNullableUpperBoundCache() {
return methodTypeParamNullableUpperBoundCache;
}

Expand Down
22 changes: 22 additions & 0 deletions nullaway/src/test/java/com/uber/nullaway/JSpecifyJDKModelsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,26 @@ void testNonNullContents(List<String> list) {
""")
.doTest();
}

@Test
public void biConsumerNullableUpperBound() {
makeHelper()
.addSourceLines(
"Test.java",
"""
import org.jspecify.annotations.*;
import java.util.function.*;
@NullMarked
class Test {
// test that we can make both type arguments @Nullable
@Nullable BiConsumer<@Nullable Object, @Nullable Object> b = null;
}
""")
.doTest();
}

private CompilationTestHelper makeHelper() {
return makeTestHelperWithArgs(
JSpecifyJavacConfig.withJSpecifyModeArgs(List.of("-XepOpt:NullAway:OnlyNullMarked=true")));
}
}
Loading