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

Pseudocode: Generate synthetic VALUE_CONSUMER for both property and class delegates

Browse Source
This commit is contained in:
Alexey Sedunov
2014-07-21 17:08:06 +04:00
parent d07deeb5fb
commit 2d3ac9109b
7 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.values
+10 -10
View File
@@ -11,14 +11,14 @@ class A(a: Int, b: Int): T
== B ==
class B(a: Int, b: Int): T by A(a + b, a - b)
---------------------
<v0>: Int NEW: magic[FAKE_INITIALIZER](a: Int) -> <v0>
<v1>: Int NEW: magic[FAKE_INITIALIZER](b: Int) -> <v1>
a <v2>: Int NEW: r(a) -> <v2>
b <v3>: Int NEW: r(b) -> <v3>
a + b <v4>: Int NEW: call(a + b, plus|<v2>, <v3>) -> <v4>
a <v5>: Int NEW: r(a) -> <v5>
b <v6>: Int NEW: r(b) -> <v6>
a - b <v7>: Int NEW: call(a - b, minus|<v5>, <v6>) -> <v7>
A(a + b, a - b) <v8>: {<: T} NEW: call(A(a + b, a - b), <init>|<v4>, <v7>) -> <v8>
T by A(a + b, a - b) <v9>: * NEW: magic[VALUE_CONSUMER](T by A(a + b, a - b)|<v8>) -> <v9>
<v0>: Int NEW: magic[FAKE_INITIALIZER](a: Int) -> <v0>
<v1>: Int NEW: magic[FAKE_INITIALIZER](b: Int) -> <v1>
<v9>: * NEW: magic[VALUE_CONSUMER](T by A(a + b, a - b)|<v8>) -> <v9>
a <v2>: Int NEW: r(a) -> <v2>
b <v3>: Int NEW: r(b) -> <v3>
a + b <v4>: Int NEW: call(a + b, plus|<v2>, <v3>) -> <v4>
a <v5>: Int NEW: r(a) -> <v5>
b <v6>: Int NEW: r(b) -> <v6>
a - b <v7>: Int NEW: call(a - b, minus|<v5>, <v6>) -> <v7>
A(a + b, a - b) <v8>: {<: T} NEW: call(A(a + b, a - b), <init>|<v4>, <v7>) -> <v8>
=====================
compiler/testData/cfg/declarations/local/ObjectExpression.values
+3 -3
View File
@@ -26,9 +26,9 @@ fun foo(b: B) : Int {
}
---------------------
<v0>: B NEW: magic[FAKE_INITIALIZER](b: B) -> <v0>
b <v1>: {<: A} NEW: r(b) -> <v1>
A by b <v2>: * NEW: magic[VALUE_CONSUMER](A by b|<v1>) -> <v2>
object : A by b {} <v3>: <no name provided> NEW: r(object : A by b {}) -> <v3>
<v2>: * NEW: magic[VALUE_CONSUMER](A by b|<v1>) -> <v2>
b <v1>: {<: A} NEW: r(b) -> <v1>
object : A by b {} <v3>: <no name provided> NEW: r(object : A by b {}) -> <v3>
o <v4>: {<: A} NEW: r(o) -> <v4>
foo() <v5>: Int NEW: call(foo(), foo|<v4>) -> <v5>
o.foo() <v5>: Int COPY
compiler/testData/cfg/declarations/properties/DelegatedProperty.instructions
+8 -7
View File
@@ -1,6 +1,6 @@
== Delegate ==
class Delegate {
fun get(_this: Any, p: PropertyMetadata): Int = 0
fun get(_this: Nothing?, p: PropertyMetadata): Int = 0
}
---------------------
L0:
@@ -13,12 +13,12 @@ sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== get ==
fun get(_this: Any, p: PropertyMetadata): Int = 0
fun get(_this: Nothing?, p: PropertyMetadata): Int = 0
---------------------
L0:
1 <START>
v(_this: Any)
magic[FAKE_INITIALIZER](_this: Any) -> <v0>
v(_this: Nothing?)
magic[FAKE_INITIALIZER](_this: Nothing?) -> <v0>
w(_this|<v0>)
v(p: PropertyMetadata)
magic[FAKE_INITIALIZER](p: PropertyMetadata) -> <v1>
@@ -55,10 +55,11 @@ L0:
1 <START>
v(val b by a)
r(a) -> <v0>
magic[VALUE_CONSUMER](val b by a|<v0>) -> <v1>
L1:
<END> NEXT:[<SINK>]
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/declarations/properties/DelegatedProperty.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Delegate {
fun get(_this: Any, p: PropertyMetadata): Int = 0
fun get(_this: Nothing?, p: PropertyMetadata): Int = 0
}
val a = Delegate()
compiler/testData/cfg/declarations/properties/DelegatedProperty.values
+5 -4
View File
@@ -1,13 +1,13 @@
== Delegate ==
class Delegate {
fun get(_this: Any, p: PropertyMetadata): Int = 0
fun get(_this: Nothing?, p: PropertyMetadata): Int = 0
}
---------------------
=====================
== get ==
fun get(_this: Any, p: PropertyMetadata): Int = 0
fun get(_this: Nothing?, p: PropertyMetadata): Int = 0
---------------------
<v0>: {<: Any} NEW: magic[FAKE_INITIALIZER](_this: Any) -> <v0>
<v0>: {<: Nothing?} NEW: magic[FAKE_INITIALIZER](_this: Nothing?) -> <v0>
<v1>: {<: PropertyMetadata} NEW: magic[FAKE_INITIALIZER](p: PropertyMetadata) -> <v1>
0 <v2>: Int NEW: r(0) -> <v2>
=====================
@@ -19,5 +19,6 @@ Delegate() <v0>: Delegate NEW: call(Delegate(), <init>) -> <v0>
== b ==
val b by a
---------------------
a <v0>: * NEW: r(a) -> <v0>
<v1>: * NEW: magic[VALUE_CONSUMER](val b by a|<v0>) -> <v1>
a <v0>: Delegate NEW: r(a) -> <v0>
=====================