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

Update control flow test data for tower resolution algorithm

Browse Source 
- locals win
- drop old invokeExtension convention
This commit is contained in:
Stanislav Erokhin
2015-12-10 18:13:35 +03:00
parent 79b30dddf9
commit dd24fd47f7
7 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg/conventions/bothReceivers.instructions
Vendored
+14 -16
View File
@@ -40,26 +40,24 @@ sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== foobar ==
fun foobar(f: Foo) {
Bar().f()
fun Foo.foobar(bar: Bar) {
bar()
}
---------------------
L0:
1 <START>
v(f: Foo)
magic[FAKE_INITIALIZER](f: Foo) -> <v0>
w(f|<v0>)
2 mark({ Bar().f() })
mark(Bar().f())
r(f) -> <v1>
mark(Bar())
call(Bar(), <init>) -> <v2>
mark(f())
call(f(), invoke|<v1>, <v2>) -> <v3>
v(bar: Bar)
magic[FAKE_INITIALIZER](bar: Bar) -> <v0>
w(bar|<v0>)
2 mark({ bar() })
r(bar) -> <v1>
magic[IMPLICIT_RECEIVER](bar()) -> <v2>
mark(bar())
call(bar(), invoke|<v1>, <v2>) -> <v3>
L1:
1 <END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/conventions/bothReceivers.kt
Vendored
+2 -2
View File
@@ -5,6 +5,6 @@ class Foo() {
fun Bar.invoke() {}
}
fun foobar(f: Foo) {
Bar().f()
fun Foo.foobar(bar: Bar) {
bar()
}
compiler/testData/cfg/conventions/bothReceivers.values
Vendored
+7 -8
View File
@@ -14,14 +14,13 @@ fun Bar.invoke() {}
---------------------
=====================
== foobar ==
fun foobar(f: Foo) {
Bar().f()
fun Foo.foobar(bar: Bar) {
bar()
}
---------------------
<v0>: Foo NEW: magic[FAKE_INITIALIZER](f: Foo) -> <v0>
Bar() <v2>: Bar NEW: call(Bar(), <init>) -> <v2>
f <v1>: Foo NEW: r(f) -> <v1>
f() <v3>: * NEW: call(f(), invoke|<v1>, <v2>) -> <v3>
Bar().f() <v3>: * COPY
{ Bar().f() } <v3>: * COPY
<v0>: Bar NEW: magic[FAKE_INITIALIZER](bar: Bar) -> <v0>
<v2>: Foo NEW: magic[IMPLICIT_RECEIVER](bar()) -> <v2>
bar <v1>: Bar NEW: r(bar) -> <v1>
bar() <v3>: * NEW: call(bar(), invoke|<v1>, <v2>) -> <v3>
{ bar() } <v3>: * COPY
=====================
compiler/testData/cfg/conventions/getViaVar.instructions
Vendored
+3 -3
View File
@@ -86,11 +86,11 @@ L0:
w(get|<v1>)
2 mark({ foo[1] })
mark(foo[1])
r(foo) -> <v2>
r(foo[1], get|<v2>) -> <v3>
r(foo[1], get) -> <v2>
r(foo) -> <v3>
r(1) -> <v4>
mark(foo[1])
call(foo[1], invoke|<v3>, <v4>) -> <v5>
call(foo[1], invoke|<v2>, <v3>, <v4>) -> <v5>
L1:
1 <END> NEXT:[<SINK>]
error:
compiler/testData/cfg/conventions/getViaVar.values
Vendored
+2 -2
View File
@@ -35,8 +35,8 @@ fun test2(foo: Foo, get: Foo.(Int) -> Int) {
---------------------
<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>
foo <v3>: Foo NEW: r(foo) -> <v3>
1 <v4>: Int NEW: r(1) -> <v4>
foo[1] <v5>: * NEW: call(foo[1], invoke|<v3>, <v4>) -> <v5>
foo[1] <v5>: * NEW: call(foo[1], invoke|<v2>, <v3>, <v4>) -> <v5>
{ foo[1] } <v5>: * COPY
=====================
compiler/testData/cfg/conventions/setViaVar.instructions
Vendored
+2 -2
View File
@@ -90,10 +90,10 @@ L0:
2 mark({ foo[1] = 2 })
mark(foo[1])
r(foo) -> <v2>
r(foo[1], set|<v2>) -> <v3>
r(foo[1], set) -> <v3>
r(1) -> <v4>
r(2) -> <v5>
call(foo[1] = 2, invoke|<v3>, <v4>, <v5>) -> <v6>
call(foo[1] = 2, invoke|<v3>, <v2>, <v4>, <v5>) -> <v6>
L1:
1 <END> NEXT:[<SINK>]
error:
compiler/testData/cfg/conventions/setViaVar.values
Vendored
+8 -8
View File
@@ -35,12 +35,12 @@ 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], set|<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
<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>: {<: (Foo, Int, Int) -> Int} NEW: r(foo[1], set) -> <v3>
2 <v5>: Int NEW: r(2) -> <v5>
foo[1] = 2 <v6>: * NEW: call(foo[1] = 2, invoke|<v3>, <v2>, <v4>, <v5>) -> <v6>
{ foo[1] = 2 } <v6>: * COPY
=====================