Get rid of redundant not-null assertion for parameter
The problem was that in `Function<T>.apply(T)` T is now not-platform, so when checking if not-null assertion is needed for parameter in SAM, it's defined by the upper bounds of T that is a platform (Any..Any?), and while it's definitely not marked as nullable it's still nullable in a sense that it can contain null as a value. So the solution is obvious #KT-16413 Fixed
This commit is contained in:
@@ -0,0 +1,21 @@
|
|||||||
|
// FILE: F.java
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
public class F {
|
||||||
|
public static <T, U> U passNull(Function<? super T, ? extends U> f) {
|
||||||
|
return f.apply(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// FILE: test.kt
|
||||||
|
// WITH_RUNTIME
|
||||||
|
// FULL_JDK
|
||||||
|
fun test(f: (Int?) -> String): String {
|
||||||
|
return F.passNull(f)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun box(): String {
|
||||||
|
return test {
|
||||||
|
it?.toString() ?: "OK"
|
||||||
|
}
|
||||||
|
}
|
||||||
+6
@@ -84,6 +84,12 @@ public class BlackBoxWithJava8CodegenTestGenerated extends AbstractBlackBoxCodeg
|
|||||||
doTest(fileName);
|
doTest(fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("functionAssertion.kt")
|
||||||
|
public void testFunctionAssertion() throws Exception {
|
||||||
|
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/functionAssertion.kt");
|
||||||
|
doTest(fileName);
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("inheritKotlin.kt")
|
@TestMetadata("inheritKotlin.kt")
|
||||||
public void testInheritKotlin() throws Exception {
|
public void testInheritKotlin() throws Exception {
|
||||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/inheritKotlin.kt");
|
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/inheritKotlin.kt");
|
||||||
|
|||||||
@@ -304,8 +304,7 @@ public class TypeUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (KotlinType supertype : getImmediateSupertypes(type)) {
|
for (KotlinType supertype : getImmediateSupertypes(type)) {
|
||||||
if (supertype.isMarkedNullable()) return true;
|
if (isNullableType(supertype)) return true;
|
||||||
if (hasNullableSuperType(supertype)) return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Reference in New Issue
Block a user