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/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