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

Control-Flow: Fix pseudocode generation for combined get/set and invoke conventions

Browse Source 
#KT-4462 Fixed
 #KT-4681 Fixed
This commit is contained in:
Alexey Sedunov
2015-05-19 15:09:03 +03:00
parent fa29e75add
commit 868329e3cb
15 changed files with 706 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.instructions
+106
View File
@@ -0,0 +1,106 @@
== Bar ==
class Bar {
fun invoke(x: Int): Int = x
fun invoke(x: Int, y: Int) {}
}
---------------------
L0:
1 <START>
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== invoke ==
fun invoke(x: Int): Int = x
---------------------
L0:
1 <START>
v(x: Int)
magic[FAKE_INITIALIZER](x: Int) -> <v0>
w(x|<v0>)
r(x) -> <v1>
ret(*|<v1>) L1
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== invoke ==
fun invoke(x: Int, y: Int) {}
---------------------
L0:
1 <START>
v(x: Int)
magic[FAKE_INITIALIZER](x: Int) -> <v0>
w(x|<v0>)
v(y: Int)
magic[FAKE_INITIALIZER](y: Int) -> <v1>
w(y|<v1>)
2 mark({})
read (Unit)
L1:
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== Foo ==
class Foo {
val get: Bar = Bar()
val set: Bar = Bar()
}
---------------------
L0:
1 <START>
v(val get: Bar = Bar())
mark(Bar())
call(Bar(), <init>) -> <v0>
w(get|<v0>)
v(val set: Bar = Bar())
mark(Bar())
call(Bar(), <init>) -> <v1>
w(set|<v1>)
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== test ==
fun test(foo: Foo) {
foo[1] += 2
}
---------------------
L0:
1 <START>
v(foo: Foo)
magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
w(foo|<v0>)
2 mark({ foo[1] += 2 })
mark(foo[1])
r(foo) -> <v1>
r(foo[1]|<v1>) -> <v2>
r(1) -> <v3>
mark(foo[1])
call(foo[1], invoke|<v2>, <v3>) -> <v4>
r(2) -> <v5>
mark(foo[1] += 2)
call(foo[1] += 2, plus|<v4>, <v5>) -> <v6>
r(foo) -> <v7>
r(foo[1]|<v7>) -> <v8>
r(1) -> <v9>
call(foo[1] += 2, invoke|<v8>, <v9>, <v6>) -> <v10>
L1:
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.kt
+13
View File
@@ -0,0 +1,13 @@
class Bar {
fun invoke(x: Int): Int = x
fun invoke(x: Int, y: Int) {}
}
class Foo {
val get: Bar = Bar()
val set: Bar = Bar()
}
fun test(foo: Foo) {
foo[1] += 2
}
compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.values
+41
View File
@@ -0,0 +1,41 @@
== Bar ==
class Bar {
fun invoke(x: Int): Int = x
fun invoke(x: Int, y: Int) {}
}
---------------------
=====================
== invoke ==
fun invoke(x: Int): Int = x
---------------------
<v0>: Int NEW: magic[FAKE_INITIALIZER](x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
=====================
== invoke ==
fun invoke(x: Int, y: Int) {}
---------------------
<v0>: Int NEW: magic[FAKE_INITIALIZER](x: Int) -> <v0>
<v1>: Int NEW: magic[FAKE_INITIALIZER](y: Int) -> <v1>
=====================
== Foo ==
class Foo {
val get: Bar = Bar()
val set: Bar = Bar()
}
---------------------
Bar() <v0>: Bar NEW: call(Bar(), <init>) -> <v0>
Bar() <v1>: Bar NEW: call(Bar(), <init>) -> <v1>
=====================
== test ==
fun test(foo: Foo) {
foo[1] += 2
}
---------------------
<v0>: Foo NEW: magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
foo <v7>: Foo NEW: r(foo) -> <v7>
1 <v9>: Int NEW: r(1) -> <v9>
foo[1] <v8>: Bar NEW: r(foo[1]|<v7>) -> <v8>
2 <v5>: Int NEW: r(2) -> <v5>
foo[1] += 2 <v10>: * NEW: call(foo[1] += 2, invoke|<v8>, <v9>, <v6>) -> <v10>
{ foo[1] += 2 } <v10>: * COPY
=====================
compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.instructions
+99
View File
@@ -0,0 +1,99 @@
== Bar ==
class Bar {
fun invoke(x: Int, y: Int) {}
}
---------------------
L0:
1 <START>
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== invoke ==
fun invoke(x: Int, y: Int) {}
---------------------
L0:
1 <START>
v(x: Int)
magic[FAKE_INITIALIZER](x: Int) -> <v0>
w(x|<v0>)
v(y: Int)
magic[FAKE_INITIALIZER](y: Int) -> <v1>
w(y|<v1>)
2 mark({})
read (Unit)
L1:
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== Foo ==
class Foo {
val set: Bar = Bar()
}
---------------------
L0:
1 <START>
v(val set: Bar = Bar())
mark(Bar())
call(Bar(), <init>) -> <v0>
w(set|<v0>)
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== get ==
fun Foo.get(x: Int): Int = x
---------------------
L0:
1 <START>
v(x: Int)
magic[FAKE_INITIALIZER](x: Int) -> <v0>
w(x|<v0>)
r(x) -> <v1>
ret(*|<v1>) L1
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== test ==
fun test(foo: Foo) {
foo[1] += 2
}
---------------------
L0:
1 <START>
v(foo: Foo)
magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
w(foo|<v0>)
2 mark({ foo[1] += 2 })
mark(foo[1])
r(foo) -> <v1>
r(1) -> <v2>
mark(foo[1])
call(foo[1], get|<v1>, <v2>) -> <v3>
r(2) -> <v4>
mark(foo[1] += 2)
call(foo[1] += 2, plus|<v3>, <v4>) -> <v5>
r(foo) -> <v6>
r(foo[1]|<v6>) -> <v7>
r(1) -> <v8>
call(foo[1] += 2, invoke|<v7>, <v8>, <v5>) -> <v9>
L1:
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.kt
+13
View File
@@ -0,0 +1,13 @@
class Bar {
fun invoke(x: Int, y: Int) {}
}
class Foo {
val set: Bar = Bar()
}
fun Foo.get(x: Int): Int = x
fun test(foo: Foo) {
foo[1] += 2
}
compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.values
+38
View File
@@ -0,0 +1,38 @@
== Bar ==
class Bar {
fun invoke(x: Int, y: Int) {}
}
---------------------
=====================
== invoke ==
fun invoke(x: Int, y: Int) {}
---------------------
<v0>: Int NEW: magic[FAKE_INITIALIZER](x: Int) -> <v0>
<v1>: Int NEW: magic[FAKE_INITIALIZER](y: Int) -> <v1>
=====================
== Foo ==
class Foo {
val set: Bar = Bar()
}
---------------------
Bar() <v0>: Bar NEW: call(Bar(), <init>) -> <v0>
=====================
== get ==
fun Foo.get(x: Int): Int = x
---------------------
<v0>: Int NEW: magic[FAKE_INITIALIZER](x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
=====================
== test ==
fun test(foo: Foo) {
foo[1] += 2
}
---------------------
<v0>: Foo NEW: magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
foo <v6>: Foo NEW: r(foo) -> <v6>
1 <v8>: Int NEW: r(1) -> <v8>
foo[1] <v7>: Bar NEW: r(foo[1]|<v6>) -> <v7>
2 <v4>: Int NEW: r(2) -> <v4>
foo[1] += 2 <v9>: * NEW: call(foo[1] += 2, invoke|<v7>, <v8>, <v5>) -> <v9>
{ foo[1] += 2 } <v9>: * COPY
=====================
compiler/testData/cfg/conventions/getViaVar.instructions
+100
View File
@@ -0,0 +1,100 @@
== Bar ==
class Bar {
fun invoke(x: Int): Int = x
}
---------------------
L0:
1 <START>
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== invoke ==
fun invoke(x: Int): Int = x
---------------------
L0:
1 <START>
v(x: Int)
magic[FAKE_INITIALIZER](x: Int) -> <v0>
w(x|<v0>)
r(x) -> <v1>
ret(*|<v1>) L1
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== Foo ==
class Foo {
val get: Bar = Bar()
}
---------------------
L0:
1 <START>
v(val get: Bar = Bar())
mark(Bar())
call(Bar(), <init>) -> <v0>
w(get|<v0>)
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== test1 ==
fun test1(foo: Foo) {
foo[1]
}
---------------------
L0:
1 <START>
v(foo: Foo)
magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
w(foo|<v0>)
2 mark({ foo[1] })
mark(foo[1])
r(foo) -> <v1>
r(foo[1]|<v1>) -> <v2>
r(1) -> <v3>
mark(foo[1])
call(foo[1], invoke|<v2>, <v3>) -> <v4>
L1:
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== test2 ==
fun test2(foo: Foo, get: Foo.(Int) -> Int) {
foo[1]
}
---------------------
L0:
1 <START>
v(foo: Foo)
magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
w(foo|<v0>)
v(get: Foo.(Int) -> Int)
magic[FAKE_INITIALIZER](get: Foo.(Int) -> Int) -> <v1>
w(get|<v1>)
2 mark({ foo[1] })
mark(foo[1])
r(foo) -> <v2>
r(foo[1]|<v2>) -> <v3>
r(1) -> <v4>
mark(foo[1])
call(foo[1], invoke|<v3>, <v4>) -> <v5>
L1:
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/conventions/getViaVar.kt
+15
View File
@@ -0,0 +1,15 @@
class Bar {
fun invoke(x: Int): Int = x
}
class Foo {
val get: Bar = Bar()
}
fun test1(foo: Foo) {
foo[1]
}
fun test2(foo: Foo, get: Foo.(Int) -> Int) {
foo[1]
}
compiler/testData/cfg/conventions/getViaVar.values
+42
View File
@@ -0,0 +1,42 @@
== Bar ==
class Bar {
fun invoke(x: Int): Int = x
}
---------------------
=====================
== invoke ==
fun invoke(x: Int): Int = x
---------------------
<v0>: Int NEW: magic[FAKE_INITIALIZER](x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
=====================
== Foo ==
class Foo {
val get: Bar = Bar()
}
---------------------
Bar() <v0>: Bar NEW: call(Bar(), <init>) -> <v0>
=====================
== test1 ==
fun test1(foo: Foo) {
foo[1]
}
---------------------
<v0>: Foo NEW: magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
foo <v1>: Foo NEW: r(foo) -> <v1>
1 <v3>: Int NEW: r(1) -> <v3>
foo[1] <v4>: * NEW: call(foo[1], invoke|<v2>, <v3>) -> <v4>
{ foo[1] } <v4>: * COPY
=====================
== test2 ==
fun test2(foo: Foo, get: Foo.(Int) -> Int) {
foo[1]
}
---------------------
<v0>: Foo NEW: magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
<v1>: {<: Foo.(Int) -> Int} NEW: magic[FAKE_INITIALIZER](get: Foo.(Int) -> Int) -> <v1>
foo <v2>: Foo NEW: r(foo) -> <v2>
1 <v4>: Int NEW: r(1) -> <v4>
foo[1] <v5>: * NEW: call(foo[1], invoke|<v3>, <v4>) -> <v5>
{ foo[1] } <v5>: * COPY
=====================
compiler/testData/cfg/conventions/setViaVar.instructions
+103
View File
@@ -0,0 +1,103 @@
== Bar ==
class Bar {
fun invoke(x: Int, y: Int) {}
}
---------------------
L0:
1 <START>
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== invoke ==
fun invoke(x: Int, y: Int) {}
---------------------
L0:
1 <START>
v(x: Int)
magic[FAKE_INITIALIZER](x: Int) -> <v0>
w(x|<v0>)
v(y: Int)
magic[FAKE_INITIALIZER](y: Int) -> <v1>
w(y|<v1>)
2 mark({})
read (Unit)
L1:
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== Foo ==
class Foo {
val set: Bar = Bar()
}
---------------------
L0:
1 <START>
v(val set: Bar = Bar())
mark(Bar())
call(Bar(), <init>) -> <v0>
w(set|<v0>)
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== test1 ==
fun test1(foo: Foo) {
foo[1] = 2
}
---------------------
L0:
1 <START>
v(foo: Foo)
magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
w(foo|<v0>)
2 mark({ foo[1] = 2 })
mark(foo[1])
r(foo) -> <v1>
r(foo[1]|<v1>) -> <v2>
r(1) -> <v3>
r(2) -> <v4>
call(foo[1] = 2, invoke|<v2>, <v3>, <v4>) -> <v5>
L1:
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== test2 ==
fun test2(foo: Foo, set: Foo.(Int, Int) -> Int) {
foo[1] = 2
}
---------------------
L0:
1 <START>
v(foo: Foo)
magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
w(foo|<v0>)
v(set: Foo.(Int, Int) -> Int)
magic[FAKE_INITIALIZER](set: Foo.(Int, Int) -> Int) -> <v1>
w(set|<v1>)
2 mark({ foo[1] = 2 })
mark(foo[1])
r(foo) -> <v2>
r(foo[1]|<v2>) -> <v3>
r(1) -> <v4>
r(2) -> <v5>
call(foo[1] = 2, invoke|<v3>, <v4>, <v5>) -> <v6>
L1:
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/conventions/setViaVar.kt
+15
View File
@@ -0,0 +1,15 @@
class Bar {
fun invoke(x: Int, y: Int) {}
}
class Foo {
val set: Bar = Bar()
}
fun test1(foo: Foo) {
foo[1] = 2
}
fun test2(foo: Foo, set: Foo.(Int, Int) -> Int) {
foo[1] = 2
}
compiler/testData/cfg/conventions/setViaVar.values
+46
View File
@@ -0,0 +1,46 @@
== Bar ==
class Bar {
fun invoke(x: Int, y: Int) {}
}
---------------------
=====================
== invoke ==
fun invoke(x: Int, y: Int) {}
---------------------
<v0>: Int NEW: magic[FAKE_INITIALIZER](x: Int) -> <v0>
<v1>: Int NEW: magic[FAKE_INITIALIZER](y: Int) -> <v1>
=====================
== Foo ==
class Foo {
val set: Bar = Bar()
}
---------------------
Bar() <v0>: Bar NEW: call(Bar(), <init>) -> <v0>
=====================
== test1 ==
fun test1(foo: Foo) {
foo[1] = 2
}
---------------------
<v0>: Foo NEW: magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
foo <v1>: Foo NEW: r(foo) -> <v1>
1 <v3>: Int NEW: r(1) -> <v3>
foo[1] <v2>: Bar NEW: r(foo[1]|<v1>) -> <v2>
2 <v4>: Int NEW: r(2) -> <v4>
foo[1] = 2 <v5>: * NEW: call(foo[1] = 2, invoke|<v2>, <v3>, <v4>) -> <v5>
{ foo[1] = 2 } <v5>: * COPY
=====================
== test2 ==
fun test2(foo: Foo, set: Foo.(Int, Int) -> Int) {
foo[1] = 2
}
---------------------
<v0>: Foo NEW: magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
<v1>: {<: Foo.(Int, Int) -> Int} NEW: magic[FAKE_INITIALIZER](set: Foo.(Int, Int) -> Int) -> <v1>
foo <v2>: Foo NEW: r(foo) -> <v2>
1 <v4>: Int NEW: r(1) -> <v4>
foo[1] <v3>: Bar NEW: r(foo[1]|<v2>) -> <v3>
2 <v5>: Int NEW: r(2) -> <v5>
foo[1] = 2 <v6>: * NEW: call(foo[1] = 2, invoke|<v3>, <v4>, <v5>) -> <v6>
{ foo[1] = 2 } <v6>: * COPY
=====================