IR: slightly fix kotlin-like dumping of super qualifiers

This commit is contained in:
Mikhail Glukhikh
2022-06-15 12:04:59 +02:00
committed by Space
parent b0a6508d4b
commit 8ae47d4c4d
35 changed files with 95 additions and 68 deletions
@@ -10,7 +10,7 @@ open enum class A : Enum<A> {
}
override fun f(): String {
return super.f().plus(other = "#Y")
return super<A>.f().plus(other = "#Y")
}
}
@@ -58,3 +58,4 @@ open enum class A : Enum<A> {
fun valueOf(value: String): A /* Synthetic body for ENUM_VALUEOF */
}
@@ -10,7 +10,7 @@ open enum class A : Enum<A> {
}
override fun f(): String {
return super.f().plus(other = "#Y")
return super<A>.f().plus(other = "#Y")
}
}
@@ -20,7 +20,7 @@ class K2 : JFoo {
}
override fun foo(): String {
return super.foo() /*!! String */
return super<JFoo>.foo() /*!! String */
}
}
@@ -42,7 +42,7 @@ class K4 : JUnrelatedFoo, IFoo {
}
override fun foo(): @FlexibleNullability String? {
return super.foo()
return super<JUnrelatedFoo>.foo()
}
}
@@ -121,3 +121,4 @@ class TestK4 : IFoo {
local /* final field */ val <$$delegate_0>: K4 = K4()
}
@@ -20,7 +20,7 @@ class K2 : JFoo {
}
override fun foo(): String {
return super.foo() /*!! String */
return super<JFoo>.foo() /*!! String */
}
}
@@ -42,7 +42,7 @@ class K4 : JUnrelatedFoo, IFoo {
}
override fun foo(): @FlexibleNullability String? {
return super.foo()
return super<JUnrelatedFoo>.foo()
}
}
@@ -116,3 +116,4 @@ class TestK4 : IFoo {
}
}
@@ -28,13 +28,14 @@ class CBoth : ILeft, IRight {
}
override fun foo() {
super.foo()
super.foo()
super<ILeft>.foo()
super<IRight>.foo()
}
override val bar: Int
override get(): Int {
return super.<get-bar>().plus(other = super.<get-bar>())
return super<ILeft>.<get-bar>().plus(other = super<IRight>.<get-bar>())
}
}
@@ -28,13 +28,14 @@ class CBoth : ILeft, IRight {
}
override fun foo() {
super.foo()
super.foo()
super<ILeft>.foo()
super<IRight>.foo()
}
override val bar: Int
override get(): Int {
return super.<get-bar>().plus(other = super.<get-bar>())
return super<ILeft>.<get-bar>().plus(other = super<IRight>.<get-bar>())
}
}
+4 -3
View File
@@ -13,7 +13,7 @@ open class Base {
open get
override fun hashCode(): Int {
return super.hashCode()
return super<Any>.hashCode()
}
}
@@ -26,12 +26,13 @@ class Derived : Base {
}
override fun foo() {
super.foo()
super<Base>.foo()
}
override val bar: String
override get(): String {
return super.<get-bar>()
return super<Base>.<get-bar>()
}
}
+4 -3
View File
@@ -13,7 +13,7 @@ open class Base {
open get
override fun hashCode(): Int {
return super.hashCode()
return super<Any>.hashCode()
}
}
@@ -26,12 +26,13 @@ class Derived : Base {
}
override fun foo() {
super.foo()
super<Base>.foo()
}
override val bar: String
override get(): String {
return super.<get-bar>()
return super<Base>.<get-bar>()
}
}
@@ -29,12 +29,13 @@ class Derived : Base, BaseI {
}
override fun foo() {
super.foo()
super<Base>.foo()
}
override val bar: String
override get(): String {
return super.<get-bar>()
return super<Base>.<get-bar>()
}
}
@@ -29,12 +29,13 @@ class Derived : Base, BaseI {
}
override fun foo() {
super.foo()
super<Base>.foo()
}
override val bar: String
override get(): String {
return super.<get-bar>()
return super<Base>.<get-bar>()
}
}