Keep inline transformation invariant: all captured parameters stored in topmost lambda/object

Fix for KT-8668: java.lang.ClassFormatError: Duplicate field name&signature (based on property access)

  #KT-8668 Fixed
This commit is contained in:
Michael Bogdanov
2015-11-18 11:56:33 +03:00
parent 93eb09a654
commit d4369c1df9
53 changed files with 1056 additions and 18 deletions
@@ -0,0 +1,6 @@
//NO_CHECK_LAMBDA_INLINING
import test.*
fun box(): String {
return A().testCall()
}
@@ -0,0 +1,20 @@
package test
class A {
fun callK(): String {
return "K"
}
fun callO(): String {
return "O"
}
fun testCall(): String = test { callO() }
inline fun test(crossinline l: () -> String): String {
return {
l() + callK()
}()
}
}
@@ -0,0 +1,6 @@
//NO_CHECK_LAMBDA_INLINING
import test.*
fun box(): String {
return Person("OK").sayName()
}
@@ -0,0 +1,15 @@
package test
class Person(val name: String) {
fun sayName() = doSayName { name }
inline fun doSayName(crossinline call: () -> String): String {
return nestedSayName1 { nestedSayName2 { call() } }
}
fun nestedSayName1(call: () -> String) = call()
inline fun nestedSayName2(call: () -> String) = call()
}
@@ -0,0 +1,9 @@
//NO_CHECK_LAMBDA_INLINING
import test.*
fun box(): String {
val res = Person("OK").sayName()
if (res != "OKsubOK") return "fail: $res"
return "OK"
}
@@ -0,0 +1,14 @@
package test
class Person(val name: String) {
fun sayName() = doSayName { name }
inline fun doSayName(crossinline call: () -> String): String {
return nestedSayName1 { name + Person("sub").nestedSayName2 { call() } }
}
fun nestedSayName1(call: () -> String) = call()
inline fun nestedSayName2(call: () -> String) = name + call()
}
@@ -0,0 +1,6 @@
//NO_CHECK_LAMBDA_INLINING
import test.*
fun box(): String {
return Company("OK").sayName()
}
@@ -0,0 +1,17 @@
package test
class Company(val name: String) {
fun sayName() = Person("test").doSayName { name }
}
class Person(val name: String) {
inline fun doSayName(crossinline call: () -> String): String {
return companyName { parsonName { call() } }
}
inline fun parsonName(call: () -> String) = call()
fun companyName(call: () -> String) = call()
}
@@ -0,0 +1,6 @@
//NO_CHECK_LAMBDA_INLINING
import test.*
fun box(): String {
return Person("OK").sayName()
}
@@ -0,0 +1,14 @@
package test
fun Person.sayName() = doSayName { name }
class Person(val name: String)
inline fun Person.doSayName(crossinline call: () -> String): String {
return companyName { parsonName { call() } }
}
inline fun Person.parsonName(call: () -> String) = call()
fun Person.companyName(call: () -> String) = call()