Do not generate unnecessary super-call checks for functions with defaults

Such check should only be generated for a function in an open class

 #KT-11962 Fixed
This commit is contained in:
Alexander Udalov
2016-12-23 18:24:26 +03:00
parent 3d9c264d63
commit b4051c4577
8 changed files with 65 additions and 46 deletions
@@ -3,25 +3,25 @@
// WITH_RUNTIME
fun def(i: Int = 0): Int {
return i;
open class MyClass {
fun def(i: Int = 0): Int {
return i
}
}
fun box():String {
val clazz = Class.forName("SuperCallCheckKt")
val method = clazz.getMethod("def\$default", Int::class.java, Int::class.java, Any::class.java)
val result = method.invoke(null, -1, 1, null)
val method = MyClass::class.java.getMethod("def\$default", MyClass::class.java, Int::class.java, Int::class.java, Any::class.java)
val result = method.invoke(null, MyClass(), -1, 1, null)
if (result != 0) return "fail 1: $result"
var failed = false
try {
method.invoke(null, -1, 1, "fail")
} catch(e: Exception) {
method.invoke(null, MyClass(), -1, 1, "fail")
}
catch(e: Exception) {
val cause = e.cause
if (cause is java.lang.UnsupportedOperationException &&
cause.message!!.startsWith("Super calls")) {
if (cause is UnsupportedOperationException && cause.message!!.startsWith("Super calls")) {
failed = true
}
}