From 8ae47d4c4d383f6a5902a70a2230f787a1f99e4e Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 15 Jun 2022 12:04:59 +0200 Subject: [PATCH] IR: slightly fix kotlin-like dumping of super qualifiers --- .../org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt | 10 ++++------ .../irText/classes/enumWithMultipleCtors.fir.kt.txt | 3 ++- .../ir/irText/classes/enumWithMultipleCtors.kt.txt | 2 +- ...mplicitNotNullOnDelegatedImplementation.fir.kt.txt | 5 +++-- .../implicitNotNullOnDelegatedImplementation.kt.txt | 5 +++-- .../ir/irText/classes/qualifiedSuperCalls.fir.kt.txt | 7 ++++--- .../ir/irText/classes/qualifiedSuperCalls.kt.txt | 7 ++++--- .../testData/ir/irText/classes/superCalls.fir.kt.txt | 7 ++++--- compiler/testData/ir/irText/classes/superCalls.kt.txt | 7 ++++--- .../ir/irText/classes/superCallsComposed.fir.kt.txt | 5 +++-- .../ir/irText/classes/superCallsComposed.kt.txt | 5 +++-- .../expressions/ambiguousFieldAccess.fir.kt.txt | 5 +++-- .../ir/irText/expressions/ambiguousFieldAccess.kt.txt | 5 +++-- .../ir/irText/expressions/coercionToUnit.kt.txt | 5 +++-- compiler/testData/ir/irText/expressions/equals.kt.txt | 5 +++-- .../jvmFieldReferenceWithIntersectionTypes.fir.kt.txt | 5 +++-- .../jvmFieldReferenceWithIntersectionTypes.kt.txt | 9 +++++---- .../expressions/jvmInstanceFieldReference.fir.kt.txt | 3 ++- .../expressions/jvmInstanceFieldReference.kt.txt | 7 ++++--- .../irText/expressions/jvmStaticFieldReference.kt.txt | 11 ++++++----- .../testData/ir/irText/expressions/kt16904.kt.txt | 3 ++- .../expressions/setFieldWithImplicitCast.kt.txt | 3 ++- .../testData/ir/irText/firProblems/JCTree.fir.kt.txt | 2 +- compiler/testData/ir/irText/firProblems/JCTree.kt.txt | 3 ++- .../firProblems/typeParameterFromJavaClass.fir.kt.txt | 3 ++- .../firProblems/typeParameterFromJavaClass.kt.txt | 3 ++- .../nullChecks/implicitNotNullOnPlatformType.kt.txt | 5 +++-- .../nullCheckOnInterfaceDelegation.fir.kt.txt | 2 +- .../nullChecks/nullCheckOnInterfaceDelegation.kt.txt | 2 +- .../types/nullChecks/platformTypeReceiver.kt.txt | 3 ++- ...ameterWithMixedNullableAndNotNullableBounds.kt.txt | 3 ++- .../typeParameterWithMultipleNotNullableBounds.kt.txt | 3 ++- .../typeParameterWithMultipleNullableBounds.kt.txt | 3 ++- .../smartCastOnFieldReceiverOfGenericType.fir.kt.txt | 2 +- .../smartCastOnFieldReceiverOfGenericType.kt.txt | 5 +++-- 35 files changed, 95 insertions(+), 68 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt index d492ea95db6..b3b0e9bb524 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt @@ -966,9 +966,8 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption } superQualifierSymbol?.let { - // TODO should we print super classifier somehow? // TODO which supper? smart mode? - p.printWithNoIndent("super") + p.printWithNoIndent("super<${it.owner.name}>") } dispatchReceiver?.let { @@ -1109,12 +1108,11 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption // it's not valid kotlin receiver?.accept(this@KotlinLikeDumper, data) superQualifierSymbol?.let { - // TODO should we print super classifier somehow? // TODO which supper? smart mode? - // TODO super and receiver at the same time: - // compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.kt // it's not valid kotlin - p.printWithNoIndent("super") + if (receiver != null) p.printWithNoIndent("(") + p.printWithNoIndent("super<${it.owner.name}>") + if (receiver != null) p.printWithNoIndent(")") } if (receiver != null || superQualifierSymbol != null) { diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.kt.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.kt.txt index c6bc1452c1a..286aaec7002 100644 --- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.kt.txt @@ -10,7 +10,7 @@ open enum class A : Enum { } override fun f(): String { - return super.f().plus(other = "#Y") + return super.f().plus(other = "#Y") } } @@ -58,3 +58,4 @@ open enum class A : Enum { fun valueOf(value: String): A /* Synthetic body for ENUM_VALUEOF */ } + diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt.txt index 2043a595047..5bae7ca8a4b 100644 --- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt.txt +++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt.txt @@ -10,7 +10,7 @@ open enum class A : Enum { } override fun f(): String { - return super.f().plus(other = "#Y") + return super.f().plus(other = "#Y") } } diff --git a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.kt.txt b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.kt.txt index edfde1ed59c..726bff4539a 100644 --- a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.kt.txt @@ -20,7 +20,7 @@ class K2 : JFoo { } override fun foo(): String { - return super.foo() /*!! String */ + return super.foo() /*!! String */ } } @@ -42,7 +42,7 @@ class K4 : JUnrelatedFoo, IFoo { } override fun foo(): @FlexibleNullability String? { - return super.foo() + return super.foo() } } @@ -121,3 +121,4 @@ class TestK4 : IFoo { local /* final field */ val <$$delegate_0>: K4 = K4() } + diff --git a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.kt.txt b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.kt.txt index 7bc4f358109..e2d1ca61d26 100644 --- a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.kt.txt +++ b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.kt.txt @@ -20,7 +20,7 @@ class K2 : JFoo { } override fun foo(): String { - return super.foo() /*!! String */ + return super.foo() /*!! String */ } } @@ -42,7 +42,7 @@ class K4 : JUnrelatedFoo, IFoo { } override fun foo(): @FlexibleNullability String? { - return super.foo() + return super.foo() } } @@ -116,3 +116,4 @@ class TestK4 : IFoo { } } + diff --git a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.kt.txt b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.kt.txt index b6675975ff3..9f8f0e4a10d 100644 --- a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.kt.txt @@ -28,13 +28,14 @@ class CBoth : ILeft, IRight { } override fun foo() { - super.foo() - super.foo() + super.foo() + super.foo() } override val bar: Int override get(): Int { - return super.().plus(other = super.()) + return super.().plus(other = super.()) } } + diff --git a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.kt.txt b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.kt.txt index b6675975ff3..9f8f0e4a10d 100644 --- a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.kt.txt +++ b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.kt.txt @@ -28,13 +28,14 @@ class CBoth : ILeft, IRight { } override fun foo() { - super.foo() - super.foo() + super.foo() + super.foo() } override val bar: Int override get(): Int { - return super.().plus(other = super.()) + return super.().plus(other = super.()) } } + diff --git a/compiler/testData/ir/irText/classes/superCalls.fir.kt.txt b/compiler/testData/ir/irText/classes/superCalls.fir.kt.txt index abea417af69..86199dfb8ae 100644 --- a/compiler/testData/ir/irText/classes/superCalls.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/superCalls.fir.kt.txt @@ -13,7 +13,7 @@ open class Base { open get override fun hashCode(): Int { - return super.hashCode() + return super.hashCode() } } @@ -26,12 +26,13 @@ class Derived : Base { } override fun foo() { - super.foo() + super.foo() } override val bar: String override get(): String { - return super.() + return super.() } } + diff --git a/compiler/testData/ir/irText/classes/superCalls.kt.txt b/compiler/testData/ir/irText/classes/superCalls.kt.txt index abea417af69..86199dfb8ae 100644 --- a/compiler/testData/ir/irText/classes/superCalls.kt.txt +++ b/compiler/testData/ir/irText/classes/superCalls.kt.txt @@ -13,7 +13,7 @@ open class Base { open get override fun hashCode(): Int { - return super.hashCode() + return super.hashCode() } } @@ -26,12 +26,13 @@ class Derived : Base { } override fun foo() { - super.foo() + super.foo() } override val bar: String override get(): String { - return super.() + return super.() } } + diff --git a/compiler/testData/ir/irText/classes/superCallsComposed.fir.kt.txt b/compiler/testData/ir/irText/classes/superCallsComposed.fir.kt.txt index 6eb02e0dfe5..cf8b8b6e429 100644 --- a/compiler/testData/ir/irText/classes/superCallsComposed.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/superCallsComposed.fir.kt.txt @@ -29,12 +29,13 @@ class Derived : Base, BaseI { } override fun foo() { - super.foo() + super.foo() } override val bar: String override get(): String { - return super.() + return super.() } } + diff --git a/compiler/testData/ir/irText/classes/superCallsComposed.kt.txt b/compiler/testData/ir/irText/classes/superCallsComposed.kt.txt index 6eb02e0dfe5..cf8b8b6e429 100644 --- a/compiler/testData/ir/irText/classes/superCallsComposed.kt.txt +++ b/compiler/testData/ir/irText/classes/superCallsComposed.kt.txt @@ -29,12 +29,13 @@ class Derived : Base, BaseI { } override fun foo() { - super.foo() + super.foo() } override val bar: String override get(): String { - return super.() + return super.() } } + diff --git a/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.fir.kt.txt b/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.fir.kt.txt index 4821fc99a1e..15ae07ec696 100644 --- a/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.fir.kt.txt @@ -13,16 +13,17 @@ class C : B { fun f(): @FlexibleNullability String? { return eval<@FlexibleNullability String?>(f = local fun (): @FlexibleNullability String? { - return super.#x + return (super).#x } ) } fun g(): @FlexibleNullability String? { return eval<@FlexibleNullability String?>(f = local fun (): @FlexibleNullability String? { - return super.#y + return (super).#y } ) } } + diff --git a/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.kt.txt b/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.kt.txt index 4821fc99a1e..15ae07ec696 100644 --- a/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.kt.txt +++ b/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.kt.txt @@ -13,16 +13,17 @@ class C : B { fun f(): @FlexibleNullability String? { return eval<@FlexibleNullability String?>(f = local fun (): @FlexibleNullability String? { - return super.#x + return (super).#x } ) } fun g(): @FlexibleNullability String? { return eval<@FlexibleNullability String?>(f = local fun (): @FlexibleNullability String? { - return super.#y + return (super).#y } ) } } + diff --git a/compiler/testData/ir/irText/expressions/coercionToUnit.kt.txt b/compiler/testData/ir/irText/expressions/coercionToUnit.kt.txt index e403a4211e9..fb989403c5c 100644 --- a/compiler/testData/ir/irText/expressions/coercionToUnit.kt.txt +++ b/compiler/testData/ir/irText/expressions/coercionToUnit.kt.txt @@ -11,17 +11,18 @@ fun test2(mc: MutableCollection) { fun test3() { { // BLOCK - val tmp0_safe_receiver: @FlexibleNullability PrintStream? = super.#out + val tmp0_safe_receiver: @FlexibleNullability PrintStream? = super.#out when { EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null else -> tmp0_safe_receiver /*!! PrintStream */.println(p0 = "Hello,") } } /*~> Unit */ { // BLOCK - val tmp1_safe_receiver: @FlexibleNullability PrintStream? = super.#out + val tmp1_safe_receiver: @FlexibleNullability PrintStream? = super.#out when { EQEQ(arg0 = tmp1_safe_receiver, arg1 = null) -> null else -> tmp1_safe_receiver /*!! PrintStream */.println(p0 = "world!") } } /*~> Unit */ } + diff --git a/compiler/testData/ir/irText/expressions/equals.kt.txt b/compiler/testData/ir/irText/expressions/equals.kt.txt index 08f0867d3c5..e00d1607e6a 100644 --- a/compiler/testData/ir/irText/expressions/equals.kt.txt +++ b/compiler/testData/ir/irText/expressions/equals.kt.txt @@ -7,9 +7,10 @@ fun testEquals(a: Int, b: Int): Boolean { } fun testJEqeqNull(): Boolean { - return EQEQ(arg0 = super.#INT_NULL, arg1 = null) + return EQEQ(arg0 = super.#INT_NULL, arg1 = null) } fun testJEqualsNull(): Boolean { - return super.#INT_NULL /*!! Int */.equals(other = null) + return super.#INT_NULL /*!! Int */.equals(other = null) } + diff --git a/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.fir.kt.txt b/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.fir.kt.txt index fe955b62632..941453d1e97 100644 --- a/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.fir.kt.txt @@ -55,7 +55,7 @@ fun test(b: Boolean) { else -> d2 } k.#f = 42 - ksuper.#f /*~> Unit */ + k(super).#f /*~> Unit */ val md1: DerivedThroughMid1 = DerivedThroughMid1() val md2: DerivedThroughMid2 = DerivedThroughMid2() val mk: Mid = when { @@ -63,5 +63,6 @@ fun test(b: Boolean) { else -> md2 } mk.#f = 44 - mksuper.#f /*~> Unit */ + mk(super).#f /*~> Unit */ } + diff --git a/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.kt.txt b/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.kt.txt index ac5235727b8..9829e9751d1 100644 --- a/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.kt.txt +++ b/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.kt.txt @@ -54,14 +54,15 @@ fun test(b: Boolean) { b -> d1 else -> d2 } - k /*as JFieldOwner */super.#f = 42 - k /*as JFieldOwner */super.#f /*~> Unit */ + k /*as JFieldOwner */(super).#f = 42 + k /*as JFieldOwner */(super).#f /*~> Unit */ val md1: DerivedThroughMid1 = DerivedThroughMid1() val md2: DerivedThroughMid2 = DerivedThroughMid2() val mk: Any = when { b -> md1 else -> md2 } - mk /*as Mid */super.#f = 44 - mk /*as Mid */super.#f /*~> Unit */ + mk /*as Mid */(super).#f = 44 + mk /*as Mid */(super).#f /*~> Unit */ } + diff --git a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.kt.txt b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.kt.txt index a2e7586c85d..bdc1eb9fde0 100644 --- a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.kt.txt @@ -10,7 +10,7 @@ class Derived : Base { } fun getValue(): Int { - return super.#value + return (super).#value } fun setValue(value: Int) { @@ -18,3 +18,4 @@ class Derived : Base { } } + diff --git a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.kt.txt b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.kt.txt index 55c08812258..564bed8bbb1 100644 --- a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.kt.txt +++ b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.kt.txt @@ -6,15 +6,16 @@ class Derived : Base { } init { - super.#value = 0 + (super).#value = 0 } fun getValue(): Int { - return super.#value + return (super).#value } fun setValue(value: Int) { - super.#value = value + (super).#value = value } } + diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.kt.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.kt.txt index d1974fa8b1c..fb473f7154e 100644 --- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.kt.txt +++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.kt.txt @@ -1,14 +1,14 @@ fun testFun() { - super.#out /*!! PrintStream */.println(p0 = "testFun") + super.#out /*!! PrintStream */.println(p0 = "testFun") } var testProp: Any get(): Any { - super.#out /*!! PrintStream */.println(p0 = "testProp/get") + super.#out /*!! PrintStream */.println(p0 = "testProp/get") return 42 } set(value: Any) { - super.#out /*!! PrintStream */.println(p0 = "testProp/set") + super.#out /*!! PrintStream */.println(p0 = "testProp/set") } class TestClass { @@ -21,14 +21,15 @@ class TestClass { val test: Int field = when { else -> { // BLOCK - super.#out /*!! PrintStream */.println(p0 = "TestClass/test") + super.#out /*!! PrintStream */.println(p0 = "TestClass/test") 42 } } get init { - super.#out /*!! PrintStream */.println(p0 = "TestClass/init") + super.#out /*!! PrintStream */.println(p0 = "TestClass/init") } } + diff --git a/compiler/testData/ir/irText/expressions/kt16904.kt.txt b/compiler/testData/ir/irText/expressions/kt16904.kt.txt index af22b83d41b..47b075f4de3 100644 --- a/compiler/testData/ir/irText/expressions/kt16904.kt.txt +++ b/compiler/testData/ir/irText/expressions/kt16904.kt.txt @@ -53,7 +53,8 @@ class Test2 : J { } init { - super.#field = 42 + (super).#field = 42 } } + diff --git a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.kt.txt b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.kt.txt index 1178a6be540..9f283474ba5 100644 --- a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.kt.txt +++ b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.kt.txt @@ -8,9 +8,10 @@ class Derived : Base { fun setValue(v: Any) { when { v is String -> { // BLOCK - super.#value = v /*as String */ + (super).#value = v /*as String */ } } } } + diff --git a/compiler/testData/ir/irText/firProblems/JCTree.fir.kt.txt b/compiler/testData/ir/irText/firProblems/JCTree.fir.kt.txt index c932dd08d23..72d8be5c19a 100644 --- a/compiler/testData/ir/irText/firProblems/JCTree.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/JCTree.fir.kt.txt @@ -13,7 +13,7 @@ class Owner { get(): String { var tree: JCTree = .() when { - tree is JCTypeApply -> return tree /*as JCTypeApply */super.#clazz /*!! String */ + tree is JCTypeApply -> return tree /*as JCTypeApply */(super).#clazz /*!! String */ } return "" } diff --git a/compiler/testData/ir/irText/firProblems/JCTree.kt.txt b/compiler/testData/ir/irText/firProblems/JCTree.kt.txt index 6d7b4d32379..b0d04fa87bf 100644 --- a/compiler/testData/ir/irText/firProblems/JCTree.kt.txt +++ b/compiler/testData/ir/irText/firProblems/JCTree.kt.txt @@ -14,10 +14,11 @@ class Owner { var tree: JCTree = .() when { tree is JCTypeApply -> { // BLOCK - return tree /*as JCTypeApply */super.#clazz /*!! String */ + return tree /*as JCTypeApply */(super).#clazz /*!! String */ } } return "" } } + diff --git a/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.fir.kt.txt b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.fir.kt.txt index 094680b0542..837259b4f38 100644 --- a/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.fir.kt.txt @@ -1,6 +1,7 @@ fun foo(movedPaths: MutableList>) { movedPaths.forEach>(action = local fun (it: Couple) { - itsuper.#second.getName() /*~> Unit */ + it(super).#second.getName() /*~> Unit */ } ) } + diff --git a/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.kt.txt b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.kt.txt index b9d5db64a2c..2608b2357eb 100644 --- a/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.kt.txt +++ b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.kt.txt @@ -1,6 +1,7 @@ fun foo(movedPaths: MutableList>) { movedPaths.forEach>(action = local fun (it: Couple) { - itsuper.#second /*!! FilePath */.getName() /*~> Unit */ + it(super).#second /*!! FilePath */.getName() /*~> Unit */ } ) } + diff --git a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.kt.txt b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.kt.txt index b261f61b19d..c26f8cd2080 100644 --- a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.kt.txt +++ b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.kt.txt @@ -33,10 +33,11 @@ class MySet : Set { fun test() { f(s = s() /*!! String */) - f(s = super.#STRING /*!! String */) + f(s = super.#STRING /*!! String */) } fun testContains(m: MySet) { - m.contains(element = super.#STRING /*!! String */) /*~> Unit */ + m.contains(element = super.#STRING /*!! String */) /*~> Unit */ m.contains(element = "abc") /*~> Unit */ } + diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnInterfaceDelegation.fir.kt.txt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnInterfaceDelegation.fir.kt.txt index d2376824ffb..9172c9ef588 100644 --- a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnInterfaceDelegation.fir.kt.txt +++ b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnInterfaceDelegation.fir.kt.txt @@ -15,7 +15,7 @@ class Derived : A, IFoo { } override fun foo(): @FlexibleNullability String? { - return super.foo() + return super.foo() } } diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnInterfaceDelegation.kt.txt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnInterfaceDelegation.kt.txt index ea9d2180702..a711a0bcae8 100644 --- a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnInterfaceDelegation.kt.txt +++ b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnInterfaceDelegation.kt.txt @@ -15,7 +15,7 @@ class Derived : A, IFoo { } override fun foo(): @FlexibleNullability String? { - return super.foo() + return super.foo() } } diff --git a/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.kt.txt b/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.kt.txt index 4e6fc2692b2..f692da6bd9a 100644 --- a/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.kt.txt +++ b/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.kt.txt @@ -1,7 +1,8 @@ fun test1(): Boolean { - return super.#BOOL_NULL /*!! Boolean */.equals(other = null) + return super.#BOOL_NULL /*!! Boolean */.equals(other = null) } fun test2(): Boolean { return boolNull() /*!! Boolean */.equals(other = null) } + diff --git a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMixedNullableAndNotNullableBounds.kt.txt b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMixedNullableAndNotNullableBounds.kt.txt index 27ce264e226..e9bbea6210b 100644 --- a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMixedNullableAndNotNullableBounds.kt.txt +++ b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMixedNullableAndNotNullableBounds.kt.txt @@ -4,5 +4,6 @@ fun f(x: T): Int where T : CharSequence?, T : Comparable { fun test() { f<@FlexibleNullability String?>(x = s()) /*~> Unit */ - f<@FlexibleNullability String?>(x = super.#STRING) /*~> Unit */ + f<@FlexibleNullability String?>(x = super.#STRING) /*~> Unit */ } + diff --git a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNotNullableBounds.kt.txt b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNotNullableBounds.kt.txt index 13f3b1f4580..80ed9403e48 100644 --- a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNotNullableBounds.kt.txt +++ b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNotNullableBounds.kt.txt @@ -4,5 +4,6 @@ fun f(x: T): Int where T : CharSequence, T : Comparable { fun test() { f<@FlexibleNullability String?>(x = s()) /*~> Unit */ - f<@FlexibleNullability String?>(x = super.#STRING) /*~> Unit */ + f<@FlexibleNullability String?>(x = super.#STRING) /*~> Unit */ } + diff --git a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNullableBounds.kt.txt b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNullableBounds.kt.txt index e210d06aec3..88ff355a728 100644 --- a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNullableBounds.kt.txt +++ b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNullableBounds.kt.txt @@ -10,5 +10,6 @@ fun f(x: T): Int? where T : CharSequence?, T : Comparable? { fun test() { f<@FlexibleNullability String?>(x = s()) /*~> Unit */ - f<@FlexibleNullability String?>(x = super.#STRING) /*~> Unit */ + f<@FlexibleNullability String?>(x = super.#STRING) /*~> Unit */ } + diff --git a/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.kt.txt b/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.kt.txt index 04a59707c0d..5bf439cb437 100644 --- a/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.kt.txt +++ b/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.kt.txt @@ -6,6 +6,6 @@ fun testSetField(a: Any, b: Any) { fun testGetField(a: Any): String { a as JCell /*~> Unit */ - return a /*as JCell */super.#value /*!! String */ + return a /*as JCell */(super).#value /*!! String */ } diff --git a/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.kt.txt b/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.kt.txt index 15e7dacd457..96678e91d79 100644 --- a/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.kt.txt +++ b/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.kt.txt @@ -1,10 +1,11 @@ fun testSetField(a: Any, b: Any) { a as JCell /*~> Unit */ b as String /*~> Unit */ - a /*as JCell */super.#value = b /*as String */ + a /*as JCell */(super).#value = b /*as String */ } fun testGetField(a: Any): String { a as JCell /*~> Unit */ - return a /*as JCell */super.#value /*!! String */ + return a /*as JCell */(super).#value /*!! String */ } +