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

Introduce IrGetValue as a replacement for IrThisReference / IrGetExtensionReceiver / IrGetVariable.

Browse Source
This commit is contained in:
Dmitry Petrov
2016-09-30 17:45:41 +03:00
parent 8efe326904
commit a51efaacc9
82 changed files with 409 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/declarations/classLevelProperties.txt
Vendored
+13 -13
View File
@@ -12,7 +12,7 @@ FILE /classLevelProperties.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test1>(): Int'
GET_FIELD 'test1: Int' type=kotlin.Int origin=null
receiver: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
PROPERTY public final val test2: kotlin.Int
FUN public final fun <get-test2>(): kotlin.Int
BLOCK_BODY
@@ -26,11 +26,11 @@ FILE /classLevelProperties.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test3>(): Int'
GET_FIELD 'test3: Int' type=kotlin.Int origin=null
receiver: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-test3>(<set-?>: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_FIELD 'test3: Int' type=kotlin.Unit origin=null
receiver: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
PROPERTY public final var test4: kotlin.Int
FIELD PROPERTY_BACKING_FIELD public final var test4: kotlin.Int
@@ -40,7 +40,7 @@ FILE /classLevelProperties.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test4>(): Int'
GET_FIELD 'test4: Int' type=kotlin.Int origin=null
receiver: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
FUN public final fun <set-test4>(value: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_FIELD 'test4: Int' type=kotlin.Unit origin=EQ
@@ -53,11 +53,11 @@ FILE /classLevelProperties.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test5>(): Int'
GET_FIELD 'test5: Int' type=kotlin.Int origin=null
receiver: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
FUN private final fun <set-test5>(<set-?>: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_FIELD 'test5: Int' type=kotlin.Unit origin=null
receiver: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
PROPERTY public final val test6: kotlin.Int = 1
FIELD PROPERTY_BACKING_FIELD public final val test6: kotlin.Int = 1
@@ -67,7 +67,7 @@ FILE /classLevelProperties.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test6>(): Int'
GET_FIELD 'test6: Int' type=kotlin.Int origin=null
receiver: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
PROPERTY public final val test7: kotlin.Int
FIELD DELEGATE val `test7$delegate`: kotlin.Lazy<kotlin.Int>
EXPRESSION_BODY
@@ -85,8 +85,8 @@ FILE /classLevelProperties.kt
CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int origin=null
<T>: Int
$receiver: GET_FIELD '`test7$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
receiver: THIS of 'C' type=C
thisRef: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
thisRef: GET_VAR '<receiver: C>' type=C origin=null
property: CALLABLE_REFERENCE 'test7: Int' type=kotlin.reflect.KProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
PROPERTY public final var test8: kotlin.Int
FIELD DELEGATE val `test8$delegate`: java.util.HashMap<kotlin.String, kotlin.Int>
@@ -100,8 +100,8 @@ FILE /classLevelProperties.kt
CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, in Int>: Int' type=kotlin.Int origin=null
<V>: Int
$receiver: GET_FIELD '`test8$delegate`: HashMap<String, Int>' type=java.util.HashMap<kotlin.String, kotlin.Int> origin=null
receiver: THIS of 'C' type=C
thisRef: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
thisRef: GET_VAR '<receiver: C>' type=C origin=null
property: CALLABLE_REFERENCE 'test8: Int' type=kotlin.reflect.KMutableProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
FUN DELEGATED_PROPERTY_ACCESSOR public final fun <set-test8>(<set-?>: kotlin.Int): kotlin.Unit
BLOCK_BODY
@@ -109,7 +109,7 @@ FILE /classLevelProperties.kt
CALL 'setValue(Any?, KProperty<*>, Int) on MutableMap<in String, in Int>: Unit' type=kotlin.Unit origin=null
<V>: Int
$receiver: GET_FIELD '`test8$delegate`: HashMap<String, Int>' type=java.util.HashMap<kotlin.String, kotlin.Int> origin=null
receiver: THIS of 'C' type=C
thisRef: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
thisRef: GET_VAR '<receiver: C>' type=C origin=null
property: CALLABLE_REFERENCE 'test8: Int' type=kotlin.reflect.KMutableProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
compiler/testData/ir/irText/declarations/delegatedProperties.txt
Vendored
+8 -8
View File
@@ -31,7 +31,7 @@ FILE /delegatedProperties.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-map>(): MutableMap<String, Any>'
GET_FIELD 'map: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=null
receiver: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
PROPERTY public final val test2: kotlin.Int
FIELD DELEGATE val `test2$delegate`: kotlin.Lazy<kotlin.Int>
EXPRESSION_BODY
@@ -49,22 +49,22 @@ FILE /delegatedProperties.kt
CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int origin=null
<T>: Int
$receiver: GET_FIELD '`test2$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
receiver: THIS of 'C' type=C
thisRef: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
thisRef: GET_VAR '<receiver: C>' type=C origin=null
property: CALLABLE_REFERENCE 'test2: Int' type=kotlin.reflect.KProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
PROPERTY public final var test3: kotlin.Any
FIELD DELEGATE 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> origin=GET_PROPERTY
$this: THIS of 'C' type=C
$this: GET_VAR '<receiver: C>' type=C origin=null
FUN DELEGATED_PROPERTY_ACCESSOR 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 origin=null
<V>: Any
$receiver: GET_FIELD '`test3$delegate`: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=null
receiver: THIS of 'C' type=C
thisRef: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
thisRef: GET_VAR '<receiver: C>' type=C origin=null
property: CALLABLE_REFERENCE 'test3: Any' type=kotlin.reflect.KMutableProperty1<C, kotlin.Any> origin=PROPERTY_REFERENCE_FOR_DELEGATE
FUN DELEGATED_PROPERTY_ACCESSOR public final fun <set-test3>(<set-?>: kotlin.Any): kotlin.Unit
BLOCK_BODY
@@ -72,8 +72,8 @@ FILE /delegatedProperties.kt
CALL 'setValue(Any?, KProperty<*>, Any) on MutableMap<in String, in Any>: Unit' type=kotlin.Unit origin=null
<V>: Any
$receiver: GET_FIELD '`test3$delegate`: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=null
receiver: THIS of 'C' type=C
thisRef: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
thisRef: GET_VAR '<receiver: C>' type=C origin=null
property: CALLABLE_REFERENCE 'test3: Any' type=kotlin.reflect.KMutableProperty1<C, kotlin.Any> origin=PROPERTY_REFERENCE_FOR_DELEGATE
value: GET_VAR 'value-parameter <set-?>: Any' type=kotlin.Any origin=null
PROPERTY public var test4: kotlin.Any
compiler/testData/ir/irText/declarations/interfaceProperties.txt
Vendored
+3 -3
View File
@@ -5,7 +5,7 @@ FILE /interfaceProperties.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test1>(): Int'
GET_FIELD 'test1: Int' type=kotlin.Int origin=null
receiver: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
PROPERTY public open val test2: kotlin.Int
FUN public open fun <get-test2>(): kotlin.Int
BLOCK_BODY
@@ -16,11 +16,11 @@ FILE /interfaceProperties.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test3>(): Int'
GET_FIELD 'test3: Int' type=kotlin.Int origin=null
receiver: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <set-test3>(<set-?>: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_FIELD 'test3: Int' type=kotlin.Unit origin=null
receiver: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
PROPERTY public open var test4: kotlin.Int
FUN public open fun <get-test4>(): kotlin.Int
compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt
Vendored
+1 -1
View File
@@ -14,4 +14,4 @@ FILE /primaryCtorDefaultArguments.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-x>(): Int'
GET_FIELD 'x: Int' type=kotlin.Int origin=null
receiver: THIS of 'Test' type=Test
receiver: GET_VAR '<receiver: Test>' type=Test origin=null
compiler/testData/ir/irText/declarations/primaryCtorProperties.txt
Vendored
+3 -3
View File
@@ -12,7 +12,7 @@ FILE /primaryCtorProperties.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test1>(): Int'
GET_FIELD 'test1: Int' type=kotlin.Int origin=null
receiver: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
PROPERTY public final var test2: kotlin.Int
FIELD PROPERTY_BACKING_FIELD public final var test2: kotlin.Int
EXPRESSION_BODY
@@ -21,9 +21,9 @@ FILE /primaryCtorProperties.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-test2>(): Int'
GET_FIELD 'test2: Int' type=kotlin.Int origin=null
receiver: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-test2>(<set-?>: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_FIELD 'test2: Int' type=kotlin.Unit origin=null
receiver: THIS of 'C' type=C
receiver: GET_VAR '<receiver: C>' type=C origin=null
value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null