Generate delegates to DefaultImpls in fun interface wrappers

#KT-37436 Fixed
This commit is contained in:
Alexander Udalov
2020-05-01 18:01:45 +02:00
parent 77e479fda8
commit fc1217ba07
17 changed files with 240 additions and 63 deletions
@@ -1,6 +1,5 @@
// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
// IGNORE_BACKEND: JVM, JVM_IR
// IGNORE_BACKEND: JVM_IR
// IGNORE_BACKEND_FIR: JVM_IR
// SKIP_DCE_DRIVEN
@@ -30,4 +29,4 @@ fun box(): String {
if (runProxy { 10 } != "10") return "fail2"
return runBase { "OK" }
}
}
@@ -0,0 +1,23 @@
// IGNORE_BACKEND: JVM_IR, JS_IR
// IGNORE_BACKEND_FIR: JVM_IR
interface I {
fun inherited(s: String): String = privateInherited(s)
private fun privateInherited(s: String): String = s
}
fun interface F : I {
fun invoke(o: String): String
fun result(): String = inherited(privateFun("O"))
private fun privateFun(s: String): String = invoke(s)
}
fun box(): String {
if (F { o -> o + "K" }.result() != "OK") return "Fail"
val lambda: (String) -> String = { o -> o + "K" }
return F(lambda).result()
}
@@ -0,0 +1,24 @@
// !JVM_DEFAULT_MODE: all-compatibility
// TARGET_BACKEND: JVM
// IGNORE_BACKEND_FIR: JVM_IR
// JVM_TARGET: 1.8
// WITH_RUNTIME
interface Base {
fun f(o: String): String = g(o)
private fun g(o: String): String = o
}
fun interface F : Base {
fun invoke(o: String): String
fun result(): String = invoke(f("O"))
}
fun box(): String {
if (F { o -> o + "K" }.result() != "OK") return "Fail"
val lambda: (String) -> String = { o -> o + "K" }
return F(lambda).result()
}
@@ -0,0 +1,24 @@
// !JVM_DEFAULT_MODE: all
// TARGET_BACKEND: JVM
// IGNORE_BACKEND_FIR: JVM_IR
// JVM_TARGET: 1.8
// WITH_RUNTIME
interface Base {
fun f(o: String): String = g(o)
private fun g(o: String): String = o
}
fun interface F : Base {
fun invoke(o: String): String
fun result(): String = invoke(f("O"))
}
fun box(): String {
if (F { o -> o + "K" }.result() != "OK") return "Fail"
val lambda: (String) -> String = { o -> o + "K" }
return F(lambda).result()
}
@@ -26,5 +26,8 @@ interface Test {
// FILE: sam.kt
fun box(): String {
val lambda = { "X" }
if (JavaCall().call(lambda) != "X") return "Fail"
return JavaCall().call {"OK"}
}