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/basic/InitializedNotDeclared.instructions
+8 -7
View File
@@ -7,15 +7,16 @@ class A {
}
---------------------
L0:
1 <START> INIT: in: {} out: {}
1 <START> INIT: in: {} out: {}
2 mark({ x = 1 })
r(1) -> <v0> USE: in: {x=ONLY_WRITTEN_NEVER_READ} out: {x=ONLY_WRITTEN_NEVER_READ}
w(x|<v0>) INIT: in: {} out: {x=I} USE: in: {} out: {x=ONLY_WRITTEN_NEVER_READ}
1 v(val x: Int) INIT: in: {x=I} out: {x=ID}
magic(x) -> <v0>
r(1) -> <v1> USE: in: {x=ONLY_WRITTEN_NEVER_READ} out: {x=ONLY_WRITTEN_NEVER_READ}
w(x|<v0>, <v1>) INIT: in: {} out: {x=I} USE: in: {} out: {x=ONLY_WRITTEN_NEVER_READ}
1 v(val x: Int) INIT: in: {x=I} out: {x=ID}
L1:
<END> INIT: in: {x=ID} out: {x=ID}
<END> INIT: in: {x=ID} out: {x=ID}
error:
<ERROR> INIT: in: {} out: {}
<ERROR> INIT: in: {} out: {}
sink:
<SINK> INIT: in: {x=ID} out: {x=ID} USE: in: {} out: {}
<SINK> INIT: in: {x=ID} out: {x=ID} USE: in: {} out: {}
=====================
compiler/testData/cfg-variables/basic/InitializedNotDeclared.values
+1 -1
View File
@@ -6,5 +6,5 @@ class A {
val x: Int
}
---------------------
1 <v0> NEW()
1 <v1> NEW()
=====================
compiler/testData/cfg-variables/basic/VariablesInitialization.instructions
+3 -3
View File
@@ -39,9 +39,9 @@ L0:
mark(foo.c)
r(foo) -> <v1> USE: in: {c=READ, foo=READ} out: {c=READ, foo=READ}
r(c|<v1>) -> <v2> USE: in: {c=ONLY_WRITTEN_NEVER_READ, foo=READ} out: {c=READ, foo=READ}
r(2) -> <v3> USE: in: {c=ONLY_WRITTEN_NEVER_READ, foo=READ} out: {c=ONLY_WRITTEN_NEVER_READ, foo=READ}
r(foo) -> <v4> USE: in: {c=ONLY_WRITTEN_NEVER_READ} out: {c=ONLY_WRITTEN_NEVER_READ, foo=READ}
w(foo.c|<v4>, <v3>) INIT: in: {foo=ID} out: {c=I, foo=ID} USE: in: {} out: {c=ONLY_WRITTEN_NEVER_READ}
r(foo) -> <v3> USE: in: {c=ONLY_WRITTEN_NEVER_READ} out: {c=ONLY_WRITTEN_NEVER_READ, foo=READ}
r(2) -> <v4> USE: in: {c=ONLY_WRITTEN_NEVER_READ} out: {c=ONLY_WRITTEN_NEVER_READ}
w(foo.c|<v3>, <v4>) INIT: in: {foo=ID} out: {c=I, foo=ID} USE: in: {} out: {c=ONLY_WRITTEN_NEVER_READ}
r(42) -> <v5> INIT: in: {c=I, foo=ID} out: {c=I, foo=ID}
L1:
1 <END>
compiler/testData/cfg-variables/basic/VariablesInitialization.values
+2 -2
View File
@@ -21,8 +21,8 @@ fun bar(foo: Foo) {
foo <v1> NEW()
c <v2> NEW(<v1>)
foo.c <v2> COPY
foo <v4> NEW()
2 <v3> NEW()
foo <v3> NEW()
2 <v4> NEW()
42 <v5> NEW()
{ foo.c foo.c = 2 42 } <v5> COPY
=====================
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>)
=====================
compiler/testData/cfg-variables/lexicalScopes/localClass.instructions
+8 -6
View File
@@ -22,13 +22,14 @@ L0:
w(x|<v1>) INIT: in: {x=D} out: {x=ID}
3 mark({ val a = x }) INIT: in: {x=ID} out: {x=ID}
v(val a = x) INIT: in: {x=ID} out: {a=D, x=ID}
r(x) -> <v2> INIT: in: {a=D, x=ID} out: {a=D, x=ID}
w(a|<v2>) INIT: in: {a=D, x=ID} out: {a=ID, x=ID}
magic(x) -> <v2> INIT: in: {a=D, x=ID} out: {a=D, x=ID}
r(x|<v2>) -> <v3>
w(a|<v3>) INIT: in: {a=D, x=ID} out: {a=ID, x=ID}
2 jmp?(L2) INIT: in: {x=ID} out: {x=ID}
d(fun foo() { val b = x }) USE: in: {x=READ} out: {x=READ}
L2:
mark("after")
r("after") -> <v3>
r("after") -> <v4>
L1:
1 <END> INIT: in: {} out: {}
error:
@@ -44,9 +45,10 @@ fun foo() {
L3:
3 <START> INIT: in: {} out: {}
4 mark({ val b = x })
v(val b = x) INIT: in: {} out: {b=D} USE: in: {x=READ} out: {x=READ}
r(x) -> <v0> INIT: in: {b=D} out: {b=D} USE: in: {} out: {x=READ}
w(b|<v0>) INIT: in: {b=D} out: {b=ID}
v(val b = x) INIT: in: {} out: {b=D}
magic(x) -> <v0> INIT: in: {b=D} out: {b=D} USE: in: {x=READ} out: {x=READ}
r(x|<v0>) -> <v1> USE: in: {} out: {x=READ}
w(b|<v1>) INIT: in: {b=D} out: {b=ID}
L4:
3 <END> INIT: in: {} out: {}
error:
compiler/testData/cfg-variables/lexicalScopes/localClass.values
+4 -4
View File
@@ -13,14 +13,14 @@ fun foo() {
}
---------------------
"before" <v0> NEW()
x <v2> NEW()
"after" <v3> NEW()
{ "before" class A(val x: Int) { { val a = x } fun foo() { val b = x } } "after" } <v3> COPY
x <v3> NEW(<v2>)
"after" <v4> NEW()
{ "before" class A(val x: Int) { { val a = x } fun foo() { val b = x } } "after" } <v4> COPY
=====================
== foo ==
fun foo() {
val b = x
}
---------------------
x <v0> NEW()
x <v1> NEW(<v0>)
=====================
compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.instructions
+8 -6
View File
@@ -35,9 +35,10 @@ get() {
---------------------
L3:
3 <START> INIT: in: {} out: {}
4 mark({ return $a }) USE: in: {a=READ} out: {a=READ}
r($a) -> <v0> USE: in: {} out: {a=READ}
ret(*|<v0>) L4
4 mark({ return $a })
magic($a) -> <v0> USE: in: {a=READ} out: {a=READ}
r($a|<v0>) -> <v1> USE: in: {} out: {a=READ}
ret(*|<v1>) L4
L4:
3 <END>
error:
@@ -55,9 +56,10 @@ L6:
v(v: Int) INIT: in: {} out: {v=D}
magic(v: Int) -> <v0> INIT: in: {v=D} out: {v=D}
w(v|<v0>) INIT: in: {v=D} out: {v=ID}
4 mark({ $a = v }) INIT: in: {v=ID} out: {v=ID} USE: in: {a=ONLY_WRITTEN_NEVER_READ, v=READ} out: {a=ONLY_WRITTEN_NEVER_READ, v=READ}
r(v) -> <v1> USE: in: {a=ONLY_WRITTEN_NEVER_READ} out: {a=ONLY_WRITTEN_NEVER_READ, v=READ}
w($a|<v1>) INIT: in: {v=ID} out: {a=I, v=ID} USE: in: {} out: {a=ONLY_WRITTEN_NEVER_READ}
4 mark({ $a = v }) INIT: in: {v=ID} out: {v=ID}
magic($a) -> <v1> USE: in: {a=ONLY_WRITTEN_NEVER_READ, v=READ} out: {a=ONLY_WRITTEN_NEVER_READ, v=READ}
r(v) -> <v2> USE: in: {a=ONLY_WRITTEN_NEVER_READ} out: {a=ONLY_WRITTEN_NEVER_READ, v=READ}
w($a|<v1>, <v2>) INIT: in: {v=ID} out: {a=I, v=ID} USE: in: {} out: {a=ONLY_WRITTEN_NEVER_READ}
L7:
3 <END> INIT: in: {a=I, v=ID} out: {a=I, v=ID}
error:
compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.values
+2 -2
View File
@@ -17,12 +17,12 @@ get() {
return $a
}
---------------------
$a <v0> NEW()
$a <v1> NEW(<v0>)
=====================
== set_a ==
set(v: Int) {
$a = v
}
---------------------
v <v1> NEW()
v <v2> NEW()
=====================