[FIR] Render nullability in type renderer, not in fir renderer

This commit is contained in:
Dmitriy Novozhilov
2019-07-29 11:47:20 +03:00
parent 3e44bc805f
commit e6bf3b3263
220 changed files with 441 additions and 418 deletions
@@ -1,5 +1,5 @@
public open class Annotated : R|kotlin/Any| {
@R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String|?): R|kotlin/String|
@R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String?|): R|kotlin/String|
public constructor(): R|Annotated|
@@ -1,11 +1,11 @@
public open class Annotated : R|kotlin/Any| {
@R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String|?): R|kotlin/String|
@R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String?|): R|kotlin/String|
public constructor(): R|Annotated|
}
public open class AnnotatedDerived : R|Annotated| {
public open operator fun foo(param: R|kotlin/String|?): R|kotlin/String|
public open operator fun foo(param: R|kotlin/String?|): R|kotlin/String|
public constructor(): R|AnnotatedDerived|
@@ -1,5 +1,5 @@
public open class A<T> : R|kotlin/Any| {
public open operator fun foo(t: R|ft<T, T?>|!): R|ft<T, T?>|!
public open operator fun foo(t: R|ft<T, T?>!|): R|ft<T, T?>!|
public constructor<T>(): R|A<T>|
@@ -11,7 +11,7 @@ FILE: simpleFakeOverride.kt
}
public final fun test(): R|kotlin/Unit| {
R|FakeOverride</A.foo: R|ft<Some, Some?>|!>|(R|/Some.Some|())
R|FakeOverride</A.foo: R|ft<Some, Some?>!|>|(R|/Some.Some|())
}
}
@@ -1,7 +1,7 @@
public open class Some : R|kotlin/Any| {
public open operator fun foo(param: R|kotlin/Int|): R|kotlin/Boolean|
public open operator fun bar(arr: R|kotlin/IntArray|): R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|
public open operator fun bar(arr: R|kotlin/IntArray|): R|kotlin/Array<ft<kotlin/String, kotlin/String?>!>|
public constructor(): R|Some|
@@ -7,7 +7,7 @@ FILE: jvm.kt
public final fun test(): R|kotlin/Unit| {
lval res1: R|kotlin/Boolean| = R|/Some.foo|(Int(1))
lval res2: R|kotlin/Boolean| = R|/Some.foo|(Int(1).R|kotlin/Int.unaryMinus|())
lval res3: R|kotlin/Array<ft<kotlin/String, kotlin/String?>>| = R|/Some.bar|(R|kotlin/intArrayOf|(Int(0), Int(2), Int(2).R|kotlin/Int.unaryMinus|()))
lval res3: R|kotlin/Array<ft<kotlin/String, kotlin/String?>!>| = R|/Some.bar|(R|kotlin/intArrayOf|(Int(0), Int(2), Int(2).R|kotlin/Int.unaryMinus|()))
}
}
@@ -1,7 +1,7 @@
public open class JavaClass : R|kotlin/Any| {
public open operator fun getText(): R|ft<kotlin/String, kotlin/String?>|!
public open operator fun getText(): R|ft<kotlin/String, kotlin/String?>!|
public open operator fun getText(param: R|ft<kotlin/String, kotlin/String?>|!): R|ft<kotlin/String, kotlin/String?>|!
public open operator fun getText(param: R|ft<kotlin/String, kotlin/String?>!|): R|ft<kotlin/String, kotlin/String?>!|
public constructor(): R|JavaClass|
@@ -1,8 +1,8 @@
FILE: Test.kt
public final fun test(): R|kotlin/Unit| {
lval jc: R|JavaClass| = R|/JavaClass.JavaClass|()
lval result: R|ft<kotlin/String, kotlin/String?>|! = R|<local>/jc|.R|/JavaClass.text|
lval result: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/jc|.R|/JavaClass.text|
}
public final fun otherTest(jc: R|JavaClass|): R|kotlin/Unit| {
lval result: R|ft<kotlin/String, kotlin/String?>|! = R|<local>/jc|.R|/JavaClass.text|
lval result: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/jc|.R|/JavaClass.text|
}
@@ -1,5 +1,5 @@
public/*package*/ open class JavaClass : R|kotlin/Any| {
public open operator fun getFoo(): R|ft<kotlin/String, kotlin/String?>|!
public open operator fun getFoo(): R|ft<kotlin/String, kotlin/String?>!|
public/*package*/ constructor(): R|JavaClass|
@@ -1,3 +1,3 @@
FILE: Test.kt
public final val x: R|ft<kotlin/String, kotlin/String?>|! = R|/JavaClass.JavaClass|().R|/JavaClass.foo|
public get(): R|ft<kotlin/String, kotlin/String?>|!
public final val x: R|ft<kotlin/String, kotlin/String?>!| = R|/JavaClass.JavaClass|().R|/JavaClass.foo|
public get(): R|ft<kotlin/String, kotlin/String?>!|
@@ -1,7 +1,7 @@
public open class A : R|kotlin/Any| {
public open operator fun foo(): R|ft<A, A?>|!
public open operator fun foo(): R|ft<A, A?>!|
public open operator fun bar(): R|ft<A, A?>|!
public open operator fun bar(): R|ft<A, A?>!|
public constructor(): R|A|