mirror of
https://github.com/jlengrand/kotlin.git
synced 2026-05-11 15:53:46 +00:00
[JVM IR] ForLoopsLowering: Keep IMPLICIT_NOTNULL type-casts in next()
and `componentN()` calls. There were issues when we have iterables from Java where the element type has "not null" type information.
This commit is contained in:
committed by
Dmitry Petrov
parent
e54ef3bdb8
commit
2dd8727baf
51
compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfExplicitNotNullFailFast.kt
vendored
Normal file
51
compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfExplicitNotNullFailFast.kt
vendored
Normal file
@@ -0,0 +1,51 @@
|
||||
// !LANGUAGE: +StrictJavaNullabilityAssertions
|
||||
// TARGET_BACKEND: JVM
|
||||
// IGNORE_BACKEND: JVM
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
// WITH_RUNTIME
|
||||
|
||||
// Note: This fails on JVM (non-IR) with "Fail: should throw on get() in loop header". The not-null assertion is not generated when
|
||||
// assigning to the loop variable. The root cause seems to be that the loop variable is a KtParameter and
|
||||
// CodegenAnnotatingVisitor/RuntimeAssertionsOnDeclarationBodyChecker do not analyze the need for not-null assertions on KtParameters.
|
||||
|
||||
// FILE: box.kt
|
||||
import kotlin.test.*
|
||||
|
||||
fun box(): String {
|
||||
// Sanity check to make sure there IS an exception even when not in a for-loop
|
||||
try {
|
||||
val i = J.listOfNotNull()[0]
|
||||
return "Fail: should throw on get()"
|
||||
} catch (e: IllegalStateException) {}
|
||||
|
||||
try {
|
||||
for (i in J.listOfNotNull()) {
|
||||
return "Fail: should throw on get() in loop header"
|
||||
}
|
||||
}
|
||||
catch (e: IllegalStateException) {}
|
||||
return "OK"
|
||||
}
|
||||
|
||||
// FILE: J.java
|
||||
import java.util.*;
|
||||
import org.jetbrains.annotations.*;
|
||||
|
||||
public class J {
|
||||
public static List<@NotNull Integer> listOfNotNull() {
|
||||
return Collections.singletonList(null);
|
||||
}
|
||||
}
|
||||
|
||||
// FILE: NotNull.java
|
||||
package org.jetbrains.annotations;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
// org.jetbrains.annotations used in the compiler is version 13, whose @NotNull does not support the TYPE_USE target (version 15 does).
|
||||
// We're using our own @org.jetbrains.annotations.NotNull for testing purposes.
|
||||
@Documented
|
||||
@Retention(RetentionPolicy.CLASS)
|
||||
@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE, ElementType.TYPE_USE})
|
||||
public @interface NotNull {
|
||||
}
|
||||
Reference in New Issue
Block a user