Drop IrPropertyAccessor (and subclasses).
Drop IrLocalPropertyAccessor (and subclasses). Introduce IrField.
This commit is contained in:
Dmitry Petrov
committed by
Dmitry Petrov
Dmitry Petrov
parent
121e949a33
commit
5c720845a8
@@ -1,6 +1,6 @@
|
||||
FILE /delegatedProperties.kt
|
||||
PROPERTY public val test1: kotlin.Int
|
||||
delegate: PROPERTY val `test1$delegate`: kotlin.Lazy<kotlin.Int>
|
||||
FIELD val `test1$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
|
||||
@@ -9,7 +9,7 @@ FILE /delegatedProperties.kt
|
||||
RETURN type=kotlin.Nothing from='<anonymous>(): Int'
|
||||
CONST Int type=kotlin.Int value='42'
|
||||
CALLABLE_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int operator=LAMBDA
|
||||
PROPERTY_GETTER public fun <get-test1>(): kotlin.Int
|
||||
FUN public fun <get-test1>(): kotlin.Int
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='<get-test1>(): Int'
|
||||
CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int operator=null
|
||||
@@ -22,10 +22,11 @@ FILE /delegatedProperties.kt
|
||||
DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
|
||||
INSTANCE_INITIALIZER_CALL classDescriptor='C'
|
||||
PROPERTY 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
|
||||
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
|
||||
PROPERTY public final val test2: kotlin.Int
|
||||
delegate: PROPERTY val `test2$delegate`: kotlin.Lazy<kotlin.Int>
|
||||
FIELD val `test2$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
|
||||
@@ -34,7 +35,7 @@ FILE /delegatedProperties.kt
|
||||
RETURN type=kotlin.Nothing from='<anonymous>(): Int'
|
||||
CONST Int type=kotlin.Int value='42'
|
||||
CALLABLE_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int operator=LAMBDA
|
||||
PROPERTY_GETTER public final fun <get-test2>(): kotlin.Int
|
||||
FUN public final fun <get-test2>(): kotlin.Int
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='<get-test2>(): Int'
|
||||
CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int operator=null
|
||||
@@ -43,11 +44,11 @@ FILE /delegatedProperties.kt
|
||||
thisRef: THIS of 'C' type=C
|
||||
property: CALLABLE_REFERENCE 'test2: Int' type=kotlin.reflect.KProperty1<C, kotlin.Int> operator=PROPERTY_REFERENCE_FOR_DELEGATE
|
||||
PROPERTY public final var test3: kotlin.Any
|
||||
delegate: PROPERTY val `test3$delegate`: kotlin.collections.MutableMap<kotlin.String, kotlin.Any>
|
||||
FIELD val `test3$delegate`: kotlin.collections.MutableMap<kotlin.String, kotlin.Any>
|
||||
EXPRESSION_BODY
|
||||
CALL '<get-map>(): MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> operator=GET_PROPERTY
|
||||
$this: THIS of 'C' type=C
|
||||
PROPERTY_GETTER public final fun <get-test3>(): kotlin.Any
|
||||
FUN public final fun <get-test3>(): kotlin.Any
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='<get-test3>(): Any'
|
||||
CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, in Any>: Any' type=kotlin.Any operator=null
|
||||
@@ -55,7 +56,7 @@ FILE /delegatedProperties.kt
|
||||
receiver: THIS of 'C' type=C
|
||||
thisRef: THIS of 'C' type=C
|
||||
property: CALLABLE_REFERENCE 'test3: Any' type=kotlin.reflect.KMutableProperty1<C, kotlin.Any> operator=PROPERTY_REFERENCE_FOR_DELEGATE
|
||||
PROPERTY_SETTER public final fun <set-test3>(<set-?>: kotlin.Any): kotlin.Unit
|
||||
FUN public final fun <set-test3>(<set-?>: kotlin.Any): kotlin.Unit
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='<set-test3>(Any): Unit'
|
||||
CALL 'setValue(Any?, KProperty<*>, Any) on MutableMap<in String, in Any>: Unit' type=kotlin.Unit operator=null
|
||||
@@ -65,17 +66,17 @@ FILE /delegatedProperties.kt
|
||||
property: CALLABLE_REFERENCE 'test3: Any' type=kotlin.reflect.KMutableProperty1<C, kotlin.Any> operator=PROPERTY_REFERENCE_FOR_DELEGATE
|
||||
value: GET_VAR 'value-parameter <set-?>: Any' type=kotlin.Any operator=null
|
||||
PROPERTY public var test4: kotlin.Any
|
||||
delegate: PROPERTY val `test4$delegate`: java.util.HashMap<kotlin.String, kotlin.Any>
|
||||
FIELD val `test4$delegate`: java.util.HashMap<kotlin.String, kotlin.Any>
|
||||
EXPRESSION_BODY
|
||||
CALL 'hashMapOf(vararg Pair<String, Any>): HashMap<String, Any>' type=java.util.HashMap<kotlin.String, kotlin.Any> operator=null
|
||||
PROPERTY_GETTER public fun <get-test4>(): kotlin.Any
|
||||
FUN public fun <get-test4>(): kotlin.Any
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='<get-test4>(): Any'
|
||||
CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, in Any>: Any' type=kotlin.Any operator=null
|
||||
$receiver: GET_BACKING_FIELD '`test4$delegate`: HashMap<String, Any>' type=java.util.HashMap<kotlin.String, kotlin.Any> operator=null
|
||||
thisRef: CONST Null type=kotlin.Nothing? value='null'
|
||||
property: CALLABLE_REFERENCE 'test4: Any' type=kotlin.reflect.KMutableProperty0<kotlin.Any> operator=PROPERTY_REFERENCE_FOR_DELEGATE
|
||||
PROPERTY_SETTER public fun <set-test4>(<set-?>: kotlin.Any): kotlin.Unit
|
||||
FUN public fun <set-test4>(<set-?>: kotlin.Any): kotlin.Unit
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='<set-test4>(Any): Unit'
|
||||
CALL 'setValue(Any?, KProperty<*>, Any) on MutableMap<in String, in Any>: Unit' type=kotlin.Unit operator=null
|
||||
|
||||
@@ -4,5 +4,10 @@ FILE /fileWithAnnotations.kt
|
||||
FUN public fun foo(): kotlin.Unit
|
||||
BLOCK_BODY
|
||||
PROPERTY public val bar: kotlin.Int = 42
|
||||
EXPRESSION_BODY
|
||||
CONST Int type=kotlin.Int value='42'
|
||||
FIELD public val bar: kotlin.Int = 42
|
||||
EXPRESSION_BODY
|
||||
CONST Int type=kotlin.Int value='42'
|
||||
FUN public fun <get-bar>(): kotlin.Int
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='<get-bar>(): Int'
|
||||
GET_BACKING_FIELD 'bar: Int' type=kotlin.Int operator=null
|
||||
|
||||
@@ -10,7 +10,7 @@ FILE /localDelegatedProperties.kt
|
||||
RETURN type=kotlin.Nothing from='<anonymous>(): Int'
|
||||
CONST Int type=kotlin.Int value='42'
|
||||
CALLABLE_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int operator=LAMBDA
|
||||
LOCAL_PROPERTY_ACCESSOR <get-x>(): Int
|
||||
FUN local final fun <get-x>(): kotlin.Int
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='<get-x>(): Int'
|
||||
CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int operator=null
|
||||
@@ -24,14 +24,14 @@ FILE /localDelegatedProperties.kt
|
||||
LOCAL_DELEGATED_PROPERTY var x: kotlin.Int
|
||||
VAR val `x$delegate`: java.util.HashMap<kotlin.String, kotlin.Int>
|
||||
CALL 'hashMapOf(vararg Pair<String, Int>): HashMap<String, Int>' type=java.util.HashMap<kotlin.String, kotlin.Int> operator=null
|
||||
LOCAL_PROPERTY_ACCESSOR <get-x>(): Int
|
||||
FUN local final fun <get-x>(): kotlin.Int
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='<get-x>(): Int'
|
||||
CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, in Int>: Int' type=kotlin.Int operator=null
|
||||
$receiver: GET_VAR '`x$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 'x: Int' type=kotlin.reflect.KMutableProperty0<kotlin.Int> operator=PROPERTY_REFERENCE_FOR_DELEGATE
|
||||
LOCAL_PROPERTY_ACCESSOR <set-x>(Int): Int
|
||||
FUN local final fun <set-x>(value: kotlin.Int): kotlin.Int
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='<set-x>(Int): Int'
|
||||
TYPE_OP operator=IMPLICIT_CAST typeOperand=kotlin.Int
|
||||
|
||||
Reference in New Issue
Block a user