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

Properly check default kind on inheriting from old DefaultImpls scheme

Browse Source
This commit is contained in:
Mikhael Bogdanov
2020-10-06 13:10:50 +02:00
parent 714d17ac63
commit 5048471835
9 changed files with 67 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes.kt
Vendored
+9 -4
View File
@@ -16,16 +16,21 @@ interface KInterface2 : KInterface {
override fun superCall() = super.superCall()
}
class Foo: KInterface2 {
fun superCall2() = super<KInterface2>.superCall()
interface KInterface3 : KInterface2 {
}
class Foo: KInterface3 {
fun superCall2() = super<KInterface3>.superCall()
}
fun box(): String {
var result = Foo().call()
if (result[1] != "KInterface\$DefaultImpls.call") return "fail 1: ${result[1]}"
if (result[2] != "KInterface2\$DefaultImpls.call") return "fail 2: ${result[2]}"
if (result[3] != "Foo.call") return "fail 3: ${result[3]}"
if (result[4] != "MainKt.box") return "fail 4: ${result[4]}"
if (result[3] != "KInterface3\$DefaultImpls.call") return "fail 3: ${result[3]}"
if (result[4] != "Foo.call") return "fail 4: ${result[4]}"
if (result[5] != "MainKt.box") return "fail 5: ${result[5]}"
result = Foo().superCall2()
if (result[1] != "KInterface\$DefaultImpls.superCall") return "fail 1: ${result[1]}"
compiler/testData/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt
Vendored
+30
View File
@@ -0,0 +1,30 @@
// IGNORE_BACKEND_FIR: JVM_IR
// FULL_JDK
// FILE: 1.kt
// !JVM_DEFAULT_MODE: disable
interface KInterface {
fun call(): List<String> {
return Thread.currentThread().getStackTrace().map { it.className + "." + it.methodName }
}
}
// FILE: main.kt
// !JVM_DEFAULT_MODE: all
// JVM_TARGET: 1.8
interface KInterface2 : KInterface {
}
class Foo: KInterface2 {
}
fun box(): String {
var result = Foo().call()
if (result[1] != "KInterface\$DefaultImpls.call") return "fail 1: ${result[1]}"
if (result[2] != "KInterface2\$DefaultImpls.call") return "fail 2: ${result[2]}"
if (result[3] != "Foo.call") return "fail 3: ${result[3]}"
if (result[4] != "MainKt.box") return "fail 4: ${result[4]}"
return "OK"
}