Don't generate unnecessary accessors for private class properties

This commit is contained in:
Alexander Udalov
2014-07-16 21:04:40 +04:00
parent 4bdf7e3426
commit a07909bb52
14 changed files with 199 additions and 42 deletions
@@ -1,9 +1,8 @@
public final class PrivateInClass implements kotlin.jvm.internal.KObject {
private final java.lang.String nn = "";
private final java.lang.String n = "";
private final java.lang.String getNn() { /* compiled code */ }
private final void setNn(@jet.runtime.typeinfo.JetValueParameter(name = "value") java.lang.String value) { /* compiled code */ }
private final java.lang.String getN() { /* compiled code */ }
private final java.lang.String bar(@jet.runtime.typeinfo.JetValueParameter(name = "a") java.lang.String a, @jet.runtime.typeinfo.JetValueParameter(name = "b", type = "?") java.lang.String b) { /* compiled code */ }
@@ -1,7 +1,10 @@
// PrivateInClass
class PrivateInClass private (s: String?) {
private val nn: String = ""
private val n: String? = ""
private var nn: String
get() = ""
set(value) {}
private val n: String?
get() = ""
private fun bar(a: String, b: String?): String? = null
}
@@ -2,6 +2,8 @@ public interface PrivateInTrait extends kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.NotNull
java.lang.String getNn();
void setNn(@jet.runtime.typeinfo.JetValueParameter(name = "value") @org.jetbrains.annotations.NotNull java.lang.String value);
@org.jetbrains.annotations.Nullable
java.lang.String getN();
@@ -1,7 +1,10 @@
// PrivateInTrait
trait PrivateInTrait {
private val nn: String
private var nn: String
get() = ""
set(value) {}
private val n: String?
get() = ""
private fun bar(a: String, b: String?): String?
}
@@ -0,0 +1,18 @@
class A(
private val x: String,
private var y: Double
) {
fun foo() {
val r = {
if (x != "abc") throw AssertionError("$x")
y = 0.0
if (y != 0.0) throw AssertionError("$y")
}
r()
}
}
fun box(): String {
A("abc", 3.14).foo()
return "OK"
}
@@ -0,0 +1,31 @@
class C {
// All these properties should have corresponding accessors
private val valWithGet: String
get() = ""
private var varWithGetSet: Int
get() = 0
set(value) {}
private var delegated: Int by Delegate
private var String.extension: String
get() = this
set(value) {}
class object {
private val classObjectVal: Long
get() = 1L
}
// This property should not have accessors
private var varNoAccessors = 0L
get set
}
object Delegate {
fun get(x: C, p: PropertyMetadata) = throw AssertionError()
fun set(x: C, p: PropertyMetadata, value: Int) = throw AssertionError()
}
@@ -0,0 +1,13 @@
// FILE: A.java
public class A {
public String getFoo() {
return "Foo";
}
}
// FILE: B.kt
class B(private val foo: String) : A() {
override fun getFoo(): String = foo
}