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

Pseudocode: Generate pseudo-values for implicit receivers

Browse Source
This commit is contained in:
Alexey Sedunov
2014-06-10 13:49:56 +04:00
parent 4e4675d24a
commit 45bd3a520e
21 changed files with 330 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.instructions
+26 -21
View File
@@ -33,15 +33,16 @@ L3:
w(x|<v0>) INIT: in: {x=D} out: {x=ID}
3 mark(sum(x - 1) + x) INIT: in: {x=ID} out: {x=ID}
mark(sum(x - 1) + x)
mark(sum(x - 1)) USE: in: {sum=READ, x=READ} out: {sum=READ, x=READ}
r(sum) -> <v1> USE: in: {x=READ} out: {sum=READ, x=READ}
mark(sum(x - 1))
magic(sum) -> <v1> USE: in: {sum=READ, x=READ} out: {sum=READ, x=READ}
r(sum|<v1>) -> <v2> USE: in: {x=READ} out: {sum=READ, x=READ}
mark(x - 1)
r(x) -> <v2>
r(1) -> <v3>
call(-, minus|<v2>, <v3>) -> <v4>
call(sum, invoke|<v1>, <v4>) -> <v5> USE: in: {x=READ} out: {x=READ}
r(x) -> <v6> USE: in: {} out: {x=READ}
call(+, plus|<v5>, <v6>) -> <v7>
r(x) -> <v3>
r(1) -> <v4>
call(-, minus|<v3>, <v4>) -> <v5>
call(sum, invoke|<v2>, <v5>) -> <v6> USE: in: {x=READ} out: {x=READ}
r(x) -> <v7> USE: in: {} out: {x=READ}
call(+, plus|<v6>, <v7>) -> <v8>
L4:
2 <END>
error:
@@ -80,16 +81,18 @@ L0:
1 <START> INIT: in: {} out: {}
v(val obj: A = object: A(obj) { { val x = obj } fun foo() { val y = obj } }) INIT: in: {} out: {obj=D}
mark(object: A(obj) { { val x = obj } fun foo() { val y = obj } }) INIT: in: {obj=D} out: {obj=D}
r(obj) -> <v0>
magic(obj) -> <v0>
r(obj|<v0>) -> <v1>
2 mark({ val x = obj })
v(val x = obj) INIT: in: {obj=D} out: {obj=D, x=D}
r(obj) -> <v1> INIT: in: {obj=D, x=D} out: {obj=D, x=D}
w(x|<v1>) INIT: in: {obj=D, x=D} out: {obj=D, x=ID}
magic(obj) -> <v2> INIT: in: {obj=D, x=D} out: {obj=D, x=D}
r(obj|<v2>) -> <v3>
w(x|<v3>) INIT: in: {obj=D, x=D} out: {obj=D, x=ID}
1 jmp?(L2) INIT: in: {obj=D} out: {obj=D}
d(fun foo() { val y = obj }) USE: in: {obj=READ} out: {obj=READ}
L2:
r(object: A(obj) { { val x = obj } fun foo() { val y = obj } }) -> <v2>
w(obj|<v2>) INIT: in: {obj=D} out: {obj=ID}
r(object: A(obj) { { val x = obj } fun foo() { val y = obj } }) -> <v4>
w(obj|<v4>) INIT: in: {obj=D} out: {obj=ID}
L1:
<END> INIT: in: {obj=ID} out: {obj=ID}
error:
@@ -105,9 +108,10 @@ fun foo() {
L3:
2 <START> INIT: in: {} out: {}
3 mark({ val y = obj })
v(val y = obj) INIT: in: {} out: {y=D} USE: in: {obj=READ} out: {obj=READ}
r(obj) -> <v0> INIT: in: {y=D} out: {y=D} USE: in: {} out: {obj=READ}
w(y|<v0>) INIT: in: {y=D} out: {y=ID}
v(val y = obj) INIT: in: {} out: {y=D}
magic(obj) -> <v0> INIT: in: {y=D} out: {y=D} USE: in: {obj=READ} out: {obj=READ}
r(obj|<v0>) -> <v1> USE: in: {} out: {obj=READ}
w(y|<v1>) INIT: in: {y=D} out: {y=ID}
L4:
2 <END> INIT: in: {} out: {}
error:
@@ -123,11 +127,12 @@ class TestOther {
L0:
1 <START> INIT: in: {} out: {}
v(val x: Int = x + 1) INIT: in: {} out: {x=D}
mark(x + 1) INIT: in: {x=D} out: {x=D} USE: in: {x=READ} out: {x=READ}
r(x) -> <v0> USE: in: {} out: {x=READ}
r(1) -> <v1>
call(+, plus|<v0>, <v1>) -> <v2>
w(x|<v2>) INIT: in: {x=D} out: {x=ID}
mark(x + 1) INIT: in: {x=D} out: {x=D}
magic(x) -> <v0> USE: in: {x=READ} out: {x=READ}
r(x|<v0>) -> <v1> USE: in: {} out: {x=READ}
r(1) -> <v2>
call(+, plus|<v1>, <v2>) -> <v3>
w(x|<v3>) INIT: in: {x=D} out: {x=ID}
L1:
<END> INIT: in: {x=ID} out: {x=ID}
error:
compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.values
+15 -15
View File
@@ -12,14 +12,14 @@ class TestFunctionLiteral {
sum(x - 1) + x
}
---------------------
sum <v1> NEW()
x <v2> NEW()
1 <v3> NEW()
x - 1 <v4> NEW(<v2>, <v3>)
sum(x - 1) <v5> NEW(<v1>, <v4>)
x <v6> NEW()
sum(x - 1) + x <v7> NEW(<v5>, <v6>)
sum(x - 1) + x <v7> COPY
sum <v2> NEW(<v1>)
x <v3> NEW()
1 <v4> NEW()
x - 1 <v5> NEW(<v3>, <v4>)
sum(x - 1) <v6> NEW(<v2>, <v5>)
x <v7> NEW()
sum(x - 1) + x <v8> NEW(<v6>, <v7>)
sum(x - 1) + x <v8> COPY
=====================
== A ==
open class A(val a: A)
@@ -37,23 +37,23 @@ class TestObjectLiteral {
}
}
---------------------
obj <v0> NEW()
obj <v1> NEW()
object: A(obj) { { val x = obj } fun foo() { val y = obj } } <v2> NEW()
obj <v1> NEW(<v0>)
obj <v3> NEW(<v2>)
object: A(obj) { { val x = obj } fun foo() { val y = obj } } <v4> NEW()
=====================
== foo ==
fun foo() {
val y = obj
}
---------------------
obj <v0> NEW()
obj <v1> NEW(<v0>)
=====================
== TestOther ==
class TestOther {
val x: Int = x + 1
}
---------------------
x <v0> NEW()
1 <v1> NEW()
x + 1 <v2> NEW(<v0>, <v1>)
x <v1> NEW(<v0>)
1 <v2> NEW()
x + 1 <v3> NEW(<v1>, <v2>)
=====================