[FIR] Fix deserializing nullability of type parameters

This commit is contained in:
Dmitriy Novozhilov
2019-11-18 16:08:34 +03:00
parent 950d1f4fe4
commit ac590fa4c9
20 changed files with 42 additions and 28 deletions
@@ -15,8 +15,8 @@ public final class ConstructorTypeParamClassObjectConflict<test> : R|kotlin/Any|
}
public final class ConstructorTypeParamClassObjectTypeConflict<test> : R|kotlin/Any| {
public final val some: R|test|
public get(): R|test|
public final val some: R|test?|
public get(): R|test?|
public constructor<test>(): R|test/ConstructorTypeParamClassObjectTypeConflict<test>|
@@ -5,16 +5,16 @@ public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
}
public abstract interface Super1<F, B> : R|kotlin/Any| {
public abstract fun bar(): R|B|
public abstract fun bar(): R|B?|
public abstract fun foo(): R|F|
public abstract fun foo(): R|F?|
}
public abstract interface Super2<FF, BB> : R|kotlin/Any| {
public abstract fun bar(): R|BB|
public abstract fun bar(): R|BB?|
public abstract fun foo(): R|FF|
public abstract fun foo(): R|FF?|
}
@@ -1,5 +1,5 @@
public final class MethosWithPRefTP : R|kotlin/Any| {
public final fun <P> f(p0: R|P|): R|kotlin/Unit|
public final fun <P> f(p0: R|P?|): R|kotlin/Unit|
public constructor(): R|test/MethosWithPRefTP|
@@ -1,5 +1,5 @@
public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| {
public open fun <A, B : R|java/lang/Runnable?|, R|kotlin/collections/List<kotlin/Cloneable>?|> foo(p0: R|A|, p1: R|kotlin/collections/List<B>?|): R|kotlin/Unit|
public open fun <A, B : R|java/lang/Runnable?|, R|kotlin/collections/List<kotlin/Cloneable>?|> foo(p0: R|A?|, p1: R|kotlin/collections/List<B>?|): R|kotlin/Unit|
public constructor(): R|test/WrongTypeParameterBoundStructure1|
@@ -1,5 +1,5 @@
public open class WrongTypeParameterBoundStructure2 : R|kotlin/Any| {
public open fun <A, B : R|java/lang/Runnable?|, R|kotlin/collections/List<kotlin/Cloneable>?|> foo(p0: R|A|, p1: R|kotlin/collections/List<B>?|): R|kotlin/Unit|
public open fun <A, B : R|java/lang/Runnable?|, R|kotlin/collections/List<kotlin/Cloneable>?|> foo(p0: R|A?|, p1: R|kotlin/collections/List<B>?|): R|kotlin/Unit|
public constructor(): R|test/WrongTypeParameterBoundStructure2|
@@ -1,5 +1,5 @@
public open class WrongTypeParametersCount : R|kotlin/Any| {
public open fun <A, B> foo(p0: R|A|, p1: R|kotlin/collections/List<B>?|): R|kotlin/Unit|
public open fun <A, B> foo(p0: R|A?|, p1: R|kotlin/collections/List<B>?|): R|kotlin/Unit|
public constructor(): R|test/WrongTypeParametersCount|
@@ -14,7 +14,7 @@ public abstract interface Kt3302 : R|kotlin/Any| {
public abstract interface LinkedHashMap<K, V> : R|kotlin/Any| {
public abstract fun dummy(): R|kotlin/Unit|
public abstract fun put(key: R|K|, value: R|V|): R|V|
public abstract fun put(key: R|K|, value: R|V|): R|V?|
}
@@ -1,13 +1,13 @@
public abstract interface OverrideWithErasedParameter : R|kotlin/Any| {
public abstract interface Sub<T> : R|test/OverrideWithErasedParameter.Super<T>| {
public abstract fun foo(p0: R|T|): R|kotlin/Unit|
public abstract fun foo(p0: R|T?|): R|kotlin/Unit|
}
public abstract interface Super<T> : R|kotlin/Any| {
public abstract fun dummy(): R|kotlin/Unit|
public abstract fun foo(p0: R|T|): R|kotlin/Unit|
public abstract fun foo(p0: R|T?|): R|kotlin/Unit|
}
@@ -1,5 +1,5 @@
public open class Max : R|kotlin/Any| {
public open fun <T : R|kotlin/Comparable<T>?|> max(p0: R|kotlin/collections/Collection<T>?|): R|T|
public open fun <T : R|kotlin/Comparable<T>?|> max(p0: R|kotlin/collections/Collection<T>?|): R|T?|
public constructor(): R|test/Max|
@@ -1,6 +1,6 @@
public final class ExtValInClass<P> : R|kotlin/Any| {
public final val R|kotlin/Int|.asas: R|P|
public get(): R|P|
public final val R|kotlin/Int|.asas: R|P?|
public get(): R|P?|
public constructor<P>(): R|test/ExtValInClass<P>|
@@ -1,7 +1,7 @@
public final class ExtValInClass<P> : R|kotlin/Any| {
public final var R|kotlin/Int|.asas: R|P|
public get(): R|P|
public set(value: R|P|): R|kotlin/Unit|
public final var R|kotlin/Int|.asas: R|P?|
public get(): R|P?|
public set(value: R|P?|): R|kotlin/Unit|
public constructor<P>(): R|test/ExtValInClass<P>|
@@ -1,5 +1,5 @@
public final class ExtValPIntInClass<P> : R|kotlin/Any| {
public final var R|P|.asas: R|kotlin/Int|
public final var R|P?|.asas: R|kotlin/Int|
public get(): R|kotlin/Int|
public set(value: R|kotlin/Int|): R|kotlin/Unit|