Skip to content

Commit

Permalink
Fix capture conversion in lenient mode. (#197)
Browse files Browse the repository at this point in the history
...by always performing capture conversion in _strict_ mode, where there
is a better-defined hierarchy (non-null < unspecified < nullable, with
no "but also unspecified < non-null if you want).

Fixes #193
  • Loading branch information
cpovirk authored Aug 14, 2024
1 parent 3c80e50 commit fc545a8
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,14 @@ public boolean isParametricQualifier(AnnotationMirror qualifier) {
}
}

@Override
public AnnotatedTypeMirror applyCaptureConversion(
AnnotatedTypeMirror type, TypeMirror typeMirror) {
return this == withLeastConvenientWorld
? super.applyCaptureConversion(type, typeMirror)
: withLeastConvenientWorld.applyCaptureConversion(type, typeMirror);
}

@Override
protected TypeHierarchy createTypeHierarchy() {
return new NullSpecTypeHierarchy(
Expand Down
33 changes: 33 additions & 0 deletions tests/regression/Issue197.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Copyright 2024 The JSpecify Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// Test case for Issue 197:
// https://github.com/jspecify/jspecify-reference-checker/issues/197

import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

class Issue197<E> {
interface Function<A, B> {}

interface Super<E> {
void i(Function<? super E, ? extends E> p);
}

@NullMarked
interface Sub<E extends @Nullable Object> extends Super<E> {
@Override
void i(Function<? super E, ? extends E> p);
}
}

0 comments on commit fc545a8

Please sign in to comment.