azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR: handle labeled super reference properly

Browse Source
This commit is contained in:
Jinseong Jeon
2020-04-30 23:37:37 -07:00
committed by Mikhail Glukhikh
parent 260683c20e
commit 7b01cf7b04
32 changed files with 141 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/inner/innerThisSuper.fir.kt
Vendored
+3 -3
View File
@@ -7,16 +7,16 @@ interface Trait {
class Outer : Trait {
class Nested {
val t = this@Outer.bar()
val s = super@Outer.<!UNRESOLVED_REFERENCE!>bar<!>()
val s = super@Outer.bar()
inner class NestedInner {
val t = this@Outer.bar()
val s = super@Outer.<!UNRESOLVED_REFERENCE!>bar<!>()
val s = super@Outer.bar()
}
}
inner class Inner {
val t = this@Outer.bar()
val s = super@Outer.<!UNRESOLVED_REFERENCE!>bar<!>()
val s = super@Outer.bar()
}
}
compiler/testData/diagnostics/tests/inner/localThisSuper.fir.kt
Vendored
+2 -2
View File
@@ -13,10 +13,10 @@ class Outer : Trait {
inner class Inner {
val t = this@Local
val s = super@Local.<!UNRESOLVED_REFERENCE!>bar<!>()
val s = super@Local.bar()
val tt = this@Outer
val ss = super@Outer.<!UNRESOLVED_REFERENCE!>bar<!>()
val ss = super@Outer.bar()
}
}
}
compiler/testData/diagnostics/tests/j+k/defaultMethods.fir.kt
Vendored
+10 -10
View File
@@ -24,7 +24,7 @@ interface KotlinInterface : JavaInterface {
object {
fun run () {
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterface.test()
}
}
}
@@ -35,7 +35,7 @@ interface KotlinInterface : JavaInterface {
object {
fun run () {
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterface.test()
}
}
return ""
@@ -53,7 +53,7 @@ interface KotlinInterfaceIndirectInheritance : KotlinInterface {
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterfaceIndirectInheritance.test()
}
}
}
@@ -64,7 +64,7 @@ interface KotlinInterfaceIndirectInheritance : KotlinInterface {
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterfaceIndirectInheritance.test()
}
}
return ""
@@ -79,7 +79,7 @@ open class KotlinClass : JavaInterface {
object {
fun run () {
super@KotlinClass.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClass.test()
}
}
}
@@ -91,7 +91,7 @@ open class KotlinClass : JavaInterface {
object {
fun run () {
super@KotlinClass.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClass.test()
}
}
return ""
@@ -106,7 +106,7 @@ class KotlinClassIndirectInheritance : KotlinClass() {
object {
fun run () {
super@KotlinClassIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClassIndirectInheritance.test()
}
}
}
@@ -118,7 +118,7 @@ class KotlinClassIndirectInheritance : KotlinClass() {
object {
fun run () {
super@KotlinClassIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClassIndirectInheritance.test()
}
}
return ""
@@ -133,7 +133,7 @@ class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
object {
fun run () {
super@KotlinClassIndirectInheritance2.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClassIndirectInheritance2.test()
}
}
}
@@ -145,7 +145,7 @@ class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
object {
fun run () {
super@KotlinClassIndirectInheritance2.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClassIndirectInheritance2.test()
}
}
return ""
compiler/testData/diagnostics/tests/j+k/defaultMethods_warning.fir.kt
Vendored
+10 -10
View File
@@ -26,7 +26,7 @@ interface KotlinInterface : JavaInterface {
object {
fun run () {
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterface.test()
}
}
}
@@ -37,7 +37,7 @@ interface KotlinInterface : JavaInterface {
object {
fun run () {
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterface.test()
}
}
return ""
@@ -55,7 +55,7 @@ interface KotlinInterfaceIndirectInheritance : KotlinInterface {
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterfaceIndirectInheritance.test()
}
}
}
@@ -66,7 +66,7 @@ interface KotlinInterfaceIndirectInheritance : KotlinInterface {
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterfaceIndirectInheritance.test()
}
}
return ""
@@ -81,7 +81,7 @@ open class KotlinClass : JavaInterface {
object {
fun run () {
super@KotlinClass.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClass.test()
}
}
}
@@ -93,7 +93,7 @@ open class KotlinClass : JavaInterface {
object {
fun run () {
super@KotlinClass.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClass.test()
}
}
return ""
@@ -108,7 +108,7 @@ class KotlinClassIndirectInheritance : KotlinClass() {
object {
fun run () {
super@KotlinClassIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClassIndirectInheritance.test()
}
}
}
@@ -120,7 +120,7 @@ class KotlinClassIndirectInheritance : KotlinClass() {
object {
fun run () {
super@KotlinClassIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClassIndirectInheritance.test()
}
}
return ""
@@ -135,7 +135,7 @@ class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
object {
fun run () {
super@KotlinClassIndirectInheritance2.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClassIndirectInheritance2.test()
}
}
}
@@ -147,7 +147,7 @@ class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
object {
fun run () {
super@KotlinClassIndirectInheritance2.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClassIndirectInheritance2.test()
}
}
return ""
compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/objectLiteralAsArgument.fir.kt
Vendored
+1 -1
View File
@@ -7,6 +7,6 @@ class A {
constructor(x: Any?)
constructor() : this(object {
fun bar() = <!UNRESOLVED_REFERENCE!>foo<!>() + this@A.<!UNRESOLVED_REFERENCE!>foo<!>() +
<!INAPPLICABLE_CANDIDATE!>foobar<!>() + super@A.hashCode()
<!INAPPLICABLE_CANDIDATE!>foobar<!>() + super@A.<!UNRESOLVED_REFERENCE!>hashCode<!>()
})
}
compiler/testData/diagnostics/tests/thisAndSuper/Super.fir.kt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ class A<E>() : C(), T {
fun test() {
super<T>.foo();
<!NOT_A_SUPERTYPE!>super<C><!>.bar()
<!NOT_A_SUPERTYPE!>super<C>@A<!>.bar()
super<C>@A.bar()
super<T>@A.foo()
super<T>@B.foo()
<!NOT_A_SUPERTYPE!>super<C>@B<!>.<!UNRESOLVED_REFERENCE!>foo<!>()
compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithInnerClass.fir.kt
Vendored
-33
View File
@@ -1,33 +0,0 @@
open class A {
open fun foo() {}
}
interface B {
fun bar() {}
}
interface Q {
fun qux() {}
}
class C : A(), B {
override fun foo() {
super@C.foo()
}
override fun bar() {
super@C.bar()
}
inner class D : A(), Q {
override fun foo() {
super@C.foo()
super@D.foo()
}
override fun qux() {
super@C.qux()
super@D.qux()
}
}
}
compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithInnerClass.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
open class A {
open fun foo() {}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.fir.kt
Vendored
+56 -56
View File
@@ -33,11 +33,11 @@ interface KotlinInterface : KInterface {
object {
fun run () {
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>property<!>
super@KotlinInterface.test()
super@KotlinInterface.property
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>testNonDefault<!>()
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>propertyNonDefault<!>
super@KotlinInterface.testNonDefault()
super@KotlinInterface.propertyNonDefault
}
}
}
@@ -53,11 +53,11 @@ interface KotlinInterface : KInterface {
object {
fun run () {
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>property<!>
super@KotlinInterface.test()
super@KotlinInterface.property
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>testNonDefault<!>()
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>propertyNonDefault<!>
super@KotlinInterface.testNonDefault()
super@KotlinInterface.propertyNonDefault
}
}
return ""
@@ -72,11 +72,11 @@ interface KotlinInterface : KInterface {
object {
fun run () {
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>property<!>
super@KotlinInterface.test()
super@KotlinInterface.property
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>testNonDefault<!>()
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>propertyNonDefault<!>
super@KotlinInterface.testNonDefault()
super@KotlinInterface.propertyNonDefault
}
}
}
@@ -91,11 +91,11 @@ interface KotlinInterface : KInterface {
object {
fun run () {
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>property<!>
super@KotlinInterface.test()
super@KotlinInterface.property
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>testNonDefault<!>()
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>propertyNonDefault<!>
super@KotlinInterface.testNonDefault()
super@KotlinInterface.propertyNonDefault
}
}
return ""
@@ -115,11 +115,11 @@ interface KotlinInterfaceIndirectInheritance : KotlinInterface {
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>property<!>
super@KotlinInterfaceIndirectInheritance.test()
super@KotlinInterfaceIndirectInheritance.property
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>testNonDefault<!>()
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>propertyNonDefault<!>
super@KotlinInterfaceIndirectInheritance.testNonDefault()
super@KotlinInterfaceIndirectInheritance.propertyNonDefault
}
}
}
@@ -135,11 +135,11 @@ interface KotlinInterfaceIndirectInheritance : KotlinInterface {
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>property<!>
super@KotlinInterfaceIndirectInheritance.test()
super@KotlinInterfaceIndirectInheritance.property
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>testNonDefault<!>()
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>propertyNonDefault<!>
super@KotlinInterfaceIndirectInheritance.testNonDefault()
super@KotlinInterfaceIndirectInheritance.propertyNonDefault
}
}
return ""
@@ -154,11 +154,11 @@ interface KotlinInterfaceIndirectInheritance : KotlinInterface {
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>property<!>
super@KotlinInterfaceIndirectInheritance.test()
super@KotlinInterfaceIndirectInheritance.property
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>testNonDefault<!>()
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>propertyNonDefault<!>
super@KotlinInterfaceIndirectInheritance.testNonDefault()
super@KotlinInterfaceIndirectInheritance.propertyNonDefault
}
}
}
@@ -173,11 +173,11 @@ interface KotlinInterfaceIndirectInheritance : KotlinInterface {
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>property<!>
super@KotlinInterfaceIndirectInheritance.test()
super@KotlinInterfaceIndirectInheritance.property
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>testNonDefault<!>()
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>propertyNonDefault<!>
super@KotlinInterfaceIndirectInheritance.testNonDefault()
super@KotlinInterfaceIndirectInheritance.propertyNonDefault
}
}
return ""
@@ -194,11 +194,11 @@ open class KotlinClass : KInterface {
object {
fun run () {
super@KotlinClass.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClass.<!UNRESOLVED_REFERENCE!>property<!>
super@KotlinClass.test()
super@KotlinClass.property
super@KotlinClass.<!UNRESOLVED_REFERENCE!>testNonDefault<!>()
super@KotlinClass.<!UNRESOLVED_REFERENCE!>propertyNonDefault<!>
super@KotlinClass.testNonDefault()
super@KotlinClass.propertyNonDefault
}
}
}
@@ -213,11 +213,11 @@ open class KotlinClass : KInterface {
object {
fun run () {
super@KotlinClass.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClass.<!UNRESOLVED_REFERENCE!>property<!>
super@KotlinClass.test()
super@KotlinClass.property
super@KotlinClass.<!UNRESOLVED_REFERENCE!>testNonDefault<!>()
super@KotlinClass.<!UNRESOLVED_REFERENCE!>propertyNonDefault<!>
super@KotlinClass.testNonDefault()
super@KotlinClass.propertyNonDefault
}
}
@@ -235,11 +235,11 @@ class KotlinClassIndirectInheritance : KotlinClass() {
object {
fun run () {
super@KotlinClassIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClassIndirectInheritance.<!UNRESOLVED_REFERENCE!>property<!>
super@KotlinClassIndirectInheritance.test()
super@KotlinClassIndirectInheritance.property
super@KotlinClassIndirectInheritance.<!UNRESOLVED_REFERENCE!>testNonDefault<!>()
super@KotlinClassIndirectInheritance.<!UNRESOLVED_REFERENCE!>propertyNonDefault<!>
super@KotlinClassIndirectInheritance.testNonDefault()
super@KotlinClassIndirectInheritance.propertyNonDefault
}
}
@@ -255,11 +255,11 @@ class KotlinClassIndirectInheritance : KotlinClass() {
object {
fun run () {
super@KotlinClassIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClassIndirectInheritance.<!UNRESOLVED_REFERENCE!>property<!>
super@KotlinClassIndirectInheritance.test()
super@KotlinClassIndirectInheritance.property
super@KotlinClassIndirectInheritance.<!UNRESOLVED_REFERENCE!>testNonDefault<!>()
super@KotlinClassIndirectInheritance.<!UNRESOLVED_REFERENCE!>propertyNonDefault<!>
super@KotlinClassIndirectInheritance.testNonDefault()
super@KotlinClassIndirectInheritance.propertyNonDefault
}
}
return ""
@@ -276,11 +276,11 @@ class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
object {
fun run () {
super@KotlinClassIndirectInheritance2.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClassIndirectInheritance2.<!UNRESOLVED_REFERENCE!>property<!>
super@KotlinClassIndirectInheritance2.test()
super@KotlinClassIndirectInheritance2.property
super@KotlinClassIndirectInheritance2.<!UNRESOLVED_REFERENCE!>testNonDefault<!>()
super@KotlinClassIndirectInheritance2.<!UNRESOLVED_REFERENCE!>propertyNonDefault<!>
super@KotlinClassIndirectInheritance2.testNonDefault()
super@KotlinClassIndirectInheritance2.propertyNonDefault
}
}
}
@@ -295,11 +295,11 @@ class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
object {
fun run () {
super@KotlinClassIndirectInheritance2.<!UNRESOLVED_REFERENCE!>test<!>()
super@KotlinClassIndirectInheritance2.<!UNRESOLVED_REFERENCE!>property<!>
super@KotlinClassIndirectInheritance2.test()
super@KotlinClassIndirectInheritance2.property
super@KotlinClassIndirectInheritance2.<!UNRESOLVED_REFERENCE!>testNonDefault<!>()
super@KotlinClassIndirectInheritance2.<!UNRESOLVED_REFERENCE!>propertyNonDefault<!>
super@KotlinClassIndirectInheritance2.testNonDefault()
super@KotlinClassIndirectInheritance2.propertyNonDefault
}
}
return ""
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.fir.kt
Vendored
-162
View File
@@ -1,162 +0,0 @@
// !JVM_DEFAULT_MODE: enable
// !JVM_TARGET: 1.8
// FILE: JavaInterface.java
public interface JavaInterface {
default String test() {
return "OK";
}
default String testOverride() {
return "OK";
}
}
// FILE: 1.kt
interface KotlinInterface : JavaInterface {
@JvmDefault
fun fooo() {
super.test()
object {
fun run () {
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>test<!>()
}
}
}
@JvmDefault
val propertyy: String
get() {
super.test()
object {
fun run () {
super@KotlinInterface.<!UNRESOLVED_REFERENCE!>test<!>()
}
}
return ""
}
@JvmDefault
override fun testOverride(): String {
return "OK";
}
}
interface KotlinInterfaceIndirectInheritance : KotlinInterface {
@JvmDefault
fun foooo() {
super.test()
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
}
}
}
@JvmDefault
val propertyyy: String
get() {
super.test()
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
}
}
return ""
}
}
open class KotlinClass : JavaInterface {
fun foo() {
super.test()
super.testOverride()
object {
fun run () {
super@KotlinClass.<!UNRESOLVED_REFERENCE!>test<!>()
}
}
}
val property: String
get() {
super.test()
super.testOverride()
object {
fun run () {
super@KotlinClass.<!UNRESOLVED_REFERENCE!>test<!>()
}
}
return ""
}
}
class KotlinClassIndirectInheritance : KotlinClass() {
fun foo2() {
super.test()
super.testOverride()
object {
fun run () {
super@KotlinClassIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
}
}
}
val property2: String
get() {
super.test()
super.testOverride()
object {
fun run () {
super@KotlinClassIndirectInheritance.<!UNRESOLVED_REFERENCE!>test<!>()
}
}
return ""
}
}
class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
fun foo() {
super.test()
super.testOverride()
object {
fun run () {
super@KotlinClassIndirectInheritance2.<!UNRESOLVED_REFERENCE!>test<!>()
}
}
}
val property: String
get() {
super.test()
super.testOverride()
object {
fun run () {
super@KotlinClassIndirectInheritance2.<!UNRESOLVED_REFERENCE!>test<!>()
}
}
return ""
}
}
fun test() {
KotlinClass().foo()
KotlinClass().property
KotlinClassIndirectInheritance2().foo()
KotlinClassIndirectInheritance2().property
KotlinClass().test()
KotlinClass().property
KotlinClass().testOverride()
KotlinClassIndirectInheritance().testOverride()
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !JVM_DEFAULT_MODE: enable
// !JVM_TARGET: 1.8
// FILE: JavaInterface.java