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

Pseudocode: Generate instructions for superclass constructor calls. Consume value of delegate expression in the by-clause

Browse Source
This commit is contained in:
Alexey Sedunov
2014-06-26 20:16:08 +04:00
parent 523beab902
commit 1c75a5f642
17 changed files with 248 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.instructions
+60
View File
@@ -0,0 +1,60 @@
== T ==
trait T
---------------------
L0:
1 <START>
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== A ==
class A(a: Int, b: Int): T
---------------------
L0:
1 <START>
v(a: Int)
magic(a: Int) -> <v0>
w(a|<v0>)
v(b: Int)
magic(b: Int) -> <v1>
w(b|<v1>)
unsupported(DELEGATOR_SUPER_CLASS : T)
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== B ==
class B(a: Int, b: Int): T by A(a + b, a - b)
---------------------
L0:
1 <START>
v(a: Int)
magic(a: Int) -> <v0>
w(a|<v0>)
v(b: Int)
magic(b: Int) -> <v1>
w(b|<v1>)
r(a) -> <v2>
r(b) -> <v3>
mark(a + b)
call(a + b, plus|<v2>, <v3>) -> <v4>
r(a) -> <v5>
r(b) -> <v6>
mark(a - b)
call(a - b, minus|<v5>, <v6>) -> <v7>
mark(A(a + b, a - b))
call(A(a + b, a - b), <init>|<v4>, <v7>) -> <v8>
magic(T by A(a + b, a - b)|<v8>) -> <v9>
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.kt
+5
View File
@@ -0,0 +1,5 @@
trait T
class A(a: Int, b: Int): T
class B(a: Int, b: Int): T by A(a + b, a - b)
compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.values
+24
View File
@@ -0,0 +1,24 @@
== T ==
trait T
---------------------
=====================
== A ==
class A(a: Int, b: Int): T
---------------------
<v0>: Int NEW: magic(a: Int) -> <v0>
<v1>: Int NEW: magic(b: Int) -> <v1>
=====================
== B ==
class B(a: Int, b: Int): T by A(a + b, a - b)
---------------------
<v0>: Int NEW: magic(a: Int) -> <v0>
<v1>: Int NEW: magic(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(T by A(a + b, a - b)|<v8>) -> <v9>
=====================
compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.instructions
+46
View File
@@ -0,0 +1,46 @@
== A ==
open class A(a: Int, b: Int)
---------------------
L0:
1 <START>
v(a: Int)
magic(a: Int) -> <v0>
w(a|<v0>)
v(b: Int)
magic(b: Int) -> <v1>
w(b|<v1>)
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== B ==
class B(a: Int, b: Int): A(a + b, a - b)
---------------------
L0:
1 <START>
v(a: Int)
magic(a: Int) -> <v0>
w(a|<v0>)
v(b: Int)
magic(b: Int) -> <v1>
w(b|<v1>)
r(a) -> <v2>
r(b) -> <v3>
mark(a + b)
call(a + b, plus|<v2>, <v3>) -> <v4>
r(a) -> <v5>
r(b) -> <v6>
mark(a - b)
call(a - b, minus|<v5>, <v6>) -> <v7>
mark(A(a + b, a - b))
call(A(a + b, a - b), <init>|<v4>, <v7>) -> <v8>
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.kt
+3
View File
@@ -0,0 +1,3 @@
open class A(a: Int, b: Int)
class B(a: Int, b: Int): A(a + b, a - b)
compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.values
+19
View File
@@ -0,0 +1,19 @@
== A ==
open class A(a: Int, b: Int)
---------------------
<v0>: Int NEW: magic(a: Int) -> <v0>
<v1>: Int NEW: magic(b: Int) -> <v1>
=====================
== B ==
class B(a: Int, b: Int): A(a + b, a - b)
---------------------
<v0>: Int NEW: magic(a: Int) -> <v0>
<v1>: Int NEW: magic(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>: * NEW: call(A(a + b, a - b), <init>|<v4>, <v7>) -> <v8>
=====================
compiler/testData/cfg/declarations/local/ObjectExpression.instructions
+6 -5
View File
@@ -67,13 +67,14 @@ L0:
v(val o = object : A by b {})
mark(object : A by b {})
r(b) -> <v1>
r(object : A by b {}) -> <v2>
w(o|<v2>)
magic(A by b|<v1>) -> <v2>
r(object : A by b {}) -> <v3>
w(o|<v3>)
mark(o.foo())
r(o) -> <v3>
r(o) -> <v4>
mark(foo())
call(foo(), foo|<v3>) -> <v4>
ret(*|<v4>) L1
call(foo(), foo|<v4>) -> <v5>
ret(*|<v5>) L1
L1:
1 <END> NEXT:[<SINK>]
error:
compiler/testData/cfg/declarations/local/ObjectExpression.values
+7 -6
View File
@@ -26,9 +26,10 @@ fun foo(b: B) : Int {
}
---------------------
<v0>: B NEW: magic(b: B) -> <v0>
b <v1>: * NEW: r(b) -> <v1>
object : A by b {} <v2>: <no name provided> NEW: r(object : A by b {}) -> <v2>
o <v3>: {<: A} NEW: r(o) -> <v3>
foo() <v4>: Int NEW: call(foo(), foo|<v3>) -> <v4>
o.foo() <v4>: Int COPY
=====================
b <v1>: {<: A} NEW: r(b) -> <v1>
A by b <v2>: * NEW: magic(A by b|<v1>) -> <v2>
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
=====================