Fix VerifyError on primitive override properties

Don't just blindly map property type in PropertyCodegen when generating getter:
we already have its full signature, so we can just as well take the type from
it. The former also isn't correct for properties which are overrides with a
primitive type. Simple mapType is safe for setter though, because the type of a
method parameter cannot change with override on JVM

The change in StackValue relates to call sites of properties which return Unit:
in that case StackValue's this.type is V, whereas the return type of its getter
is Ljet/Unit; -- so coerceTo was coercing from the wrong type in case of getter
calls

 #KT-4373 Fixed
 #KT-4383 Fixed
This commit is contained in:
Alexander Udalov
2014-01-13 21:23:38 +04:00
parent b92e121458
commit 7041a10ecf
7 changed files with 86 additions and 11 deletions
@@ -0,0 +1,14 @@
trait Tr<T> {
val prop: T
}
class A(a: Tr<Int>) : Tr<Int> by a
fun eat(x: Int) {}
fun box(): String {
eat(A(object : Tr<Int> {
override val prop = 42
}).prop)
return "OK"
}
@@ -0,0 +1,16 @@
class D {
fun get(a: Any, p: PropertyMetadata) { }
}
object P {
val u = Unit.VALUE
val v by D()
var w = Unit.VALUE
}
fun box(): String {
if (P.u != P.v) return "Fail uv"
P.w = Unit.VALUE
if (P.w != P.u) return "Fail w"
return "OK"
}
@@ -0,0 +1,11 @@
trait R<in T: Comparable<T>> {
var value: T
}
class A(override var value: Int): R<Int>
fun box(): String {
val a = A(239)
a.value = 42
return if (a.value == 42) "OK" else "Fail 1"
}
@@ -0,0 +1,18 @@
class Holder(var value: Int) {
fun get(that: Any?, desc: PropertyMetadata) = value
fun set(that: Any?, desc: PropertyMetadata, newValue: Int) { value = newValue }
}
trait R<in T: Comparable<T>> {
var value: T
}
class A(start: Int) : R<Int> {
override var value: Int by Holder(start)
}
fun box(): String {
val a = A(239)
a.value = 42
return if (a.value == 42) "OK" else "Fail 1"
}