azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properties declared in primary constructors should have proper accessors in IR.

Browse Source
This commit is contained in:
Dmitry Petrov
2016-09-12 12:22:08 +03:00
committed by Dmitry Petrov
parent 5c720845a8
commit 201d2414bc
26 changed files with 649 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/declarations/classLevelProperties.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
// WITH_RUNTIME
class C {
val test1 = 0
val test2: Int get() = 0
var test3 = 0
var test4 = 1; set(value) {
field = value
}
var test5 = 1; private set
val test6 = 1; get
val test7 by lazy { 42 }
var test8 by hashMapOf<String, Int>()
}
compiler/testData/ir/irText/declarations/classLevelProperties.txt
Vendored
+109
View File
@@ -0,0 +1,109 @@
FILE /classLevelProperties.kt
CLASS CLASS C
CONSTRUCTOR public constructor C()
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
INSTANCE_INITIALIZER_CALL classDescriptor='C'
PROPERTY public final val test1: kotlin.Int = 0
FIELD public final val test1: kotlin.Int = 0
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
FUN public final fun <get-test1>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test1>(): Int'
GET_BACKING_FIELD 'test1: Int' type=kotlin.Int operator=null
receiver: THIS of 'C' type=C
PROPERTY public final val test2: kotlin.Int
FUN public final fun <get-test2>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test2>(): Int'
CONST Int type=kotlin.Int value='0'
PROPERTY public final var test3: kotlin.Int
FIELD public final var test3: kotlin.Int
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
FUN public final fun <get-test3>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test3>(): Int'
GET_BACKING_FIELD 'test3: Int' type=kotlin.Int operator=null
receiver: THIS of 'C' type=C
FUN public final fun <set-test3>(<set-?>: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_BACKING_FIELD 'test3: Int' type=kotlin.Unit operator=null
receiver: THIS of 'C' type=C
value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int operator=null
PROPERTY public final var test4: kotlin.Int
FIELD public final var test4: kotlin.Int
EXPRESSION_BODY
CONST Int type=kotlin.Int value='1'
FUN public final fun <get-test4>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test4>(): Int'
GET_BACKING_FIELD 'test4: Int' type=kotlin.Int operator=null
receiver: THIS of 'C' type=C
FUN public final fun <set-test4>(value: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_BACKING_FIELD 'test4: Int' type=kotlin.Unit operator=EQ
value: GET_VAR 'value-parameter value: Int' type=kotlin.Int operator=null
PROPERTY public final var test5: kotlin.Int
FIELD public final var test5: kotlin.Int
EXPRESSION_BODY
CONST Int type=kotlin.Int value='1'
FUN public final fun <get-test5>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test5>(): Int'
GET_BACKING_FIELD 'test5: Int' type=kotlin.Int operator=null
receiver: THIS of 'C' type=C
FUN private final fun <set-test5>(<set-?>: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_BACKING_FIELD 'test5: Int' type=kotlin.Unit operator=null
receiver: THIS of 'C' type=C
value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int operator=null
PROPERTY public final val test6: kotlin.Int = 1
FIELD public final val test6: kotlin.Int = 1
EXPRESSION_BODY
CONST Int type=kotlin.Int value='1'
FUN public final fun <get-test6>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test6>(): Int'
GET_BACKING_FIELD 'test6: Int' type=kotlin.Int operator=null
receiver: THIS of 'C' type=C
PROPERTY public final val test7: kotlin.Int
FIELD val `test7$delegate`: kotlin.Lazy<kotlin.Int>
EXPRESSION_BODY
CALL 'lazy(() -> Int): Lazy<Int>' type=kotlin.Lazy<kotlin.Int> operator=null
initializer: BLOCK type=() -> kotlin.Int operator=LAMBDA
FUN local final fun <anonymous>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<anonymous>(): Int'
CONST Int type=kotlin.Int value='42'
CALLABLE_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int operator=LAMBDA
FUN public final fun <get-test7>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test7>(): Int'
CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int operator=null
$receiver: GET_BACKING_FIELD '`test7$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> operator=null
receiver: THIS of 'C' type=C
thisRef: THIS of 'C' type=C
property: CALLABLE_REFERENCE 'test7: Int' type=kotlin.reflect.KProperty1<C, kotlin.Int> operator=PROPERTY_REFERENCE_FOR_DELEGATE
PROPERTY public final var test8: kotlin.Int
FIELD val `test8$delegate`: java.util.HashMap<kotlin.String, kotlin.Int>
EXPRESSION_BODY
CALL 'hashMapOf(vararg Pair<String, Int>): HashMap<String, Int>' type=java.util.HashMap<kotlin.String, kotlin.Int> operator=null
FUN public final fun <get-test8>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test8>(): Int'
CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, in Int>: Int' type=kotlin.Int operator=null
$receiver: GET_BACKING_FIELD '`test8$delegate`: HashMap<String, Int>' type=java.util.HashMap<kotlin.String, kotlin.Int> operator=null
receiver: THIS of 'C' type=C
thisRef: THIS of 'C' type=C
property: CALLABLE_REFERENCE 'test8: Int' type=kotlin.reflect.KMutableProperty1<C, kotlin.Int> operator=PROPERTY_REFERENCE_FOR_DELEGATE
FUN public final fun <set-test8>(<set-?>: kotlin.Int): kotlin.Unit
BLOCK_BODY
RETURN type=kotlin.Nothing from='<set-test8>(Int): Unit'
CALL 'setValue(Any?, KProperty<*>, Int) on MutableMap<in String, in Int>: Unit' type=kotlin.Unit operator=null
$receiver: GET_BACKING_FIELD '`test8$delegate`: HashMap<String, Int>' type=java.util.HashMap<kotlin.String, kotlin.Int> operator=null
receiver: THIS of 'C' type=C
thisRef: THIS of 'C' type=C
property: CALLABLE_REFERENCE 'test8: Int' type=kotlin.reflect.KMutableProperty1<C, kotlin.Int> operator=PROPERTY_REFERENCE_FOR_DELEGATE
value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int operator=null
compiler/testData/ir/irText/declarations/delegatedProperties.txt
Vendored
+5
View File
@@ -25,6 +25,11 @@ FILE /delegatedProperties.kt
FIELD public final val map: kotlin.collections.MutableMap<kotlin.String, kotlin.Any>
EXPRESSION_BODY
GET_VAR 'value-parameter map: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> operator=INITIALIZE_PROPERTY_FROM_PARAMETER
FUN public final fun <get-map>(): kotlin.collections.MutableMap<kotlin.String, kotlin.Any>
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-map>(): MutableMap<String, Any>'
GET_BACKING_FIELD 'map: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> operator=null
receiver: THIS of 'C' type=C
PROPERTY public final val test2: kotlin.Int
FIELD val `test2$delegate`: kotlin.Lazy<kotlin.Int>
EXPRESSION_BODY
compiler/testData/ir/irText/declarations/packageLevelProperties.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
// WITH_RUNTIME
val test1 = 0
val test2: Int get() = 0
var test3 = 0
var test4 = 1; set(value) { field = value }
var test5 = 1; private set
val test6 = 1; get
val test7 by lazy { 42 }
var test8 by hashMapOf<String, Int>()
compiler/testData/ir/irText/declarations/packageLevelProperties.txt
Vendored
+94
View File
@@ -0,0 +1,94 @@
FILE /packageLevelProperties.kt
PROPERTY public val test1: kotlin.Int = 0
FIELD public val test1: kotlin.Int = 0
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
FUN public fun <get-test1>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test1>(): Int'
GET_BACKING_FIELD 'test1: Int' type=kotlin.Int operator=null
PROPERTY public val test2: kotlin.Int
FUN public fun <get-test2>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test2>(): Int'
CONST Int type=kotlin.Int value='0'
PROPERTY public var test3: kotlin.Int
FIELD public var test3: kotlin.Int
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
FUN public fun <get-test3>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test3>(): Int'
GET_BACKING_FIELD 'test3: Int' type=kotlin.Int operator=null
FUN public fun <set-test3>(<set-?>: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_BACKING_FIELD 'test3: Int' type=kotlin.Unit operator=null
value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int operator=null
PROPERTY public var test4: kotlin.Int
FIELD public var test4: kotlin.Int
EXPRESSION_BODY
CONST Int type=kotlin.Int value='1'
FUN public fun <get-test4>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test4>(): Int'
GET_BACKING_FIELD 'test4: Int' type=kotlin.Int operator=null
FUN public fun <set-test4>(value: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_BACKING_FIELD 'test4: Int' type=kotlin.Unit operator=EQ
value: GET_VAR 'value-parameter value: Int' type=kotlin.Int operator=null
PROPERTY public var test5: kotlin.Int
FIELD public var test5: kotlin.Int
EXPRESSION_BODY
CONST Int type=kotlin.Int value='1'
FUN public fun <get-test5>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test5>(): Int'
GET_BACKING_FIELD 'test5: Int' type=kotlin.Int operator=null
FUN private fun <set-test5>(<set-?>: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_BACKING_FIELD 'test5: Int' type=kotlin.Unit operator=null
value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int operator=null
PROPERTY public val test6: kotlin.Int = 1
FIELD public val test6: kotlin.Int = 1
EXPRESSION_BODY
CONST Int type=kotlin.Int value='1'
FUN public fun <get-test6>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test6>(): Int'
GET_BACKING_FIELD 'test6: Int' type=kotlin.Int operator=null
PROPERTY public val test7: kotlin.Int
FIELD val `test7$delegate`: kotlin.Lazy<kotlin.Int>
EXPRESSION_BODY
CALL 'lazy(() -> Int): Lazy<Int>' type=kotlin.Lazy<kotlin.Int> operator=null
initializer: BLOCK type=() -> kotlin.Int operator=LAMBDA
FUN local final fun <anonymous>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<anonymous>(): Int'
CONST Int type=kotlin.Int value='42'
CALLABLE_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int operator=LAMBDA
FUN public fun <get-test7>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test7>(): Int'
CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int operator=null
$receiver: GET_BACKING_FIELD '`test7$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> operator=null
thisRef: CONST Null type=kotlin.Nothing? value='null'
property: CALLABLE_REFERENCE 'test7: Int' type=kotlin.reflect.KProperty0<kotlin.Int> operator=PROPERTY_REFERENCE_FOR_DELEGATE
PROPERTY public var test8: kotlin.Int
FIELD val `test8$delegate`: java.util.HashMap<kotlin.String, kotlin.Int>
EXPRESSION_BODY
CALL 'hashMapOf(vararg Pair<String, Int>): HashMap<String, Int>' type=java.util.HashMap<kotlin.String, kotlin.Int> operator=null
FUN public fun <get-test8>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test8>(): Int'
CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, in Int>: Int' type=kotlin.Int operator=null
$receiver: GET_BACKING_FIELD '`test8$delegate`: HashMap<String, Int>' type=java.util.HashMap<kotlin.String, kotlin.Int> operator=null
thisRef: CONST Null type=kotlin.Nothing? value='null'
property: CALLABLE_REFERENCE 'test8: Int' type=kotlin.reflect.KMutableProperty0<kotlin.Int> operator=PROPERTY_REFERENCE_FOR_DELEGATE
FUN public fun <set-test8>(<set-?>: kotlin.Int): kotlin.Unit
BLOCK_BODY
RETURN type=kotlin.Nothing from='<set-test8>(Int): Unit'
CALL 'setValue(Any?, KProperty<*>, Int) on MutableMap<in String, in Int>: Unit' type=kotlin.Unit operator=null
$receiver: GET_BACKING_FIELD '`test8$delegate`: HashMap<String, Int>' type=java.util.HashMap<kotlin.String, kotlin.Int> operator=null
thisRef: CONST Null type=kotlin.Nothing? value='null'
property: CALLABLE_REFERENCE 'test8: Int' type=kotlin.reflect.KMutableProperty0<kotlin.Int> operator=PROPERTY_REFERENCE_FOR_DELEGATE
value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int operator=null
compiler/testData/ir/irText/declarations/primaryCtorProperties.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
class C(
val test1: Int,
var test2: Int
)
compiler/testData/ir/irText/declarations/primaryCtorProperties.txt
Vendored
+29
View File
@@ -0,0 +1,29 @@
FILE /primaryCtorProperties.kt
CLASS CLASS C
CONSTRUCTOR public constructor C(test1: kotlin.Int, test2: kotlin.Int)
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
INSTANCE_INITIALIZER_CALL classDescriptor='C'
PROPERTY public final val test1: kotlin.Int
FIELD public final val test1: kotlin.Int
EXPRESSION_BODY
GET_VAR 'value-parameter test1: Int' type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
FUN public final fun <get-test1>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test1>(): Int'
GET_BACKING_FIELD 'test1: Int' type=kotlin.Int operator=null
receiver: THIS of 'C' type=C
PROPERTY public final var test2: kotlin.Int
FIELD public final var test2: kotlin.Int
EXPRESSION_BODY
GET_VAR 'value-parameter test2: Int' type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
FUN public final fun <get-test2>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test2>(): Int'
GET_BACKING_FIELD 'test2: Int' type=kotlin.Int operator=null
receiver: THIS of 'C' type=C
FUN public final fun <set-test2>(<set-?>: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_BACKING_FIELD 'test2: Int' type=kotlin.Unit operator=null
receiver: THIS of 'C' type=C
value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int operator=null