Fix mapping of nullable generic underlying types of inline classes

#KT-32162 Fixed
This commit is contained in:
Ilmir Usmanov
2022-02-22 00:15:32 +01:00
committed by teamcity
parent 981f8b1871
commit 8811f62300
77 changed files with 3400 additions and 131 deletions
@@ -0,0 +1,33 @@
// WITH_STDLIB
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses, +GenericInlineClassParameter
OPTIONAL_JVM_INLINE_ANNOTATION
value class Value<T: Any>(val value: T?)
object Foo {
fun foo(value: Value<String>) {
res = value.value
}
fun bar(value: Value<String>?) {
res = value?.value
}
}
var res: String? = "FAIL"
fun box(): String {
Value<String>("OK").let(Foo::foo)
if (res != "OK") return "FAIL 1: $res"
res = "FAIL 2"
Value<String>("OK").let(Foo::bar)
if (res != "OK") return "FAIL 3: $res"
res = "FAIL 4"
null.let(Foo::bar)
if (res != null) return "FAIL 5: $res"
return "OK"
}
@@ -0,0 +1,34 @@
// WITH_STDLIB
// WORKS_WHEN_VALUE_CLASS
// CHECK_BYTECODE_LISTING
// LANGUAGE: +ValueClasses, +GenericInlineClassParameter
OPTIONAL_JVM_INLINE_ANNOTATION
value class Value<T: Int>(val value: T?)
object Foo {
fun foo(value: Value<Int>) {
res = value.value
}
fun bar(value: Value<Int>?) {
res = value?.value
}
}
var res: Int? = 0
fun box(): String {
Value<Int>(42).let(Foo::foo)
if (res != 42) return "FAIL 1 $res"
res = 0
Value<Int>(42).let(Foo::bar)
if (res != 42) return "FAIL 2 $res"
res = 0
null.let(Foo::bar)
if (res != null) return "FAIL 3: $res"
return "OK"
}
@@ -0,0 +1,38 @@
@kotlin.Metadata
public final class Foo {
// source: 'intNGeneric2.kt'
public final static @org.jetbrains.annotations.NotNull field INSTANCE: Foo
static method <clinit>(): void
private method <init>(): void
public final method bar-vRV1vHs(@org.jetbrains.annotations.Nullable p0: Value): void
public final method foo-YR_CVCc(@org.jetbrains.annotations.NotNull p0: java.lang.Integer): void
}
@kotlin.Metadata
public final class IntNGeneric2Kt {
// source: 'intNGeneric2.kt'
private static @org.jetbrains.annotations.Nullable field res: java.lang.Integer
static method <clinit>(): void
public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
public final static @org.jetbrains.annotations.Nullable method getRes(): java.lang.Integer
public final static method setRes(@org.jetbrains.annotations.Nullable p0: java.lang.Integer): void
}
@kotlin.jvm.JvmInline
@kotlin.Metadata
public final class Value {
// source: 'intNGeneric2.kt'
private final @org.jetbrains.annotations.Nullable field value: java.lang.Integer
private synthetic method <init>(p0: java.lang.Integer): void
public synthetic final static method box-impl(p0: java.lang.Integer): Value
public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.Nullable p0: java.lang.Integer): java.lang.Integer
public method equals(p0: java.lang.Object): boolean
public static method equals-impl(p0: java.lang.Integer, p1: java.lang.Object): boolean
public final static method equals-impl0(p0: java.lang.Integer, p1: java.lang.Integer): boolean
public final @org.jetbrains.annotations.Nullable method getValue(): java.lang.Integer
public method hashCode(): int
public static method hashCode-impl(p0: java.lang.Integer): int
public method toString(): java.lang.String
public static method toString-impl(p0: java.lang.Integer): java.lang.String
public synthetic final method unbox-impl(): java.lang.Integer
}
@@ -0,0 +1,32 @@
// WITH_STDLIB
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses, +GenericInlineClassParameter
OPTIONAL_JVM_INLINE_ANNOTATION
value class Value<T: String>(val value: T?)
object Foo {
fun foo(value: Value<String>) {
res = value.value
}
fun bar(value: Value<String>?) {
res = value?.value
}
}
var res: String? = "FAIL"
fun box(): String {
Value<String>("OK").let(Foo::foo)
if (res != "OK") return "FAIL 1: $res"
res = "FAIL 2"
Value<String>("OK").let(Foo::bar)
if (res != "OK") return "FAIL 3: $res"
res = "FAIL 4"
null.let(Foo::bar)
if (res != null) return "FAIL 3: $res"
return "OK"
}