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

Updated tests for control flow: call instruction stores call element

Browse Source 
instead of callee expression
This commit is contained in:
Svetlana Isakova
2014-07-02 18:27:19 +04:00
parent 72e9822d99
commit aa26db0538
110 changed files with 1084 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.instructions
+22 -22
View File
@@ -27,28 +27,28 @@ sink:
}
---------------------
L3:
2 <START> INIT: in: {} out: {}
v(x: Int) INIT: in: {} out: {x=D}
magic(x: Int) -> <v0> INIT: in: {x=D} out: {x=D}
w(x|<v0>) INIT: in: {x=D} out: {x=ID}
3 mark(sum(x - 1) + x) INIT: in: {x=ID} out: {x=ID}
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}
2 <START> INIT: in: {} out: {}
v(x: Int) INIT: in: {} out: {x=D}
magic(x: Int) -> <v0> INIT: in: {x=D} out: {x=D}
w(x|<v0>) INIT: in: {x=D} out: {x=ID}
3 mark(sum(x - 1) + x) INIT: in: {x=ID} out: {x=ID}
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}
r(x) -> <v3>
r(1) -> <v4>
mark(x - 1)
call(-, minus|<v3>, <v4>) -> <v5>
call(x - 1, minus|<v3>, <v4>) -> <v5>
mark(sum(x - 1))
call(sum, invoke|<v2>, <v5>) -> <v6> USE: in: {x=READ} out: {x=READ}
r(x) -> <v7> USE: in: {} out: {x=READ}
call(sum(x - 1), invoke|<v2>, <v5>) -> <v6> USE: in: {x=READ} out: {x=READ}
r(x) -> <v7> USE: in: {} out: {x=READ}
mark(sum(x - 1) + x)
call(+, plus|<v6>, <v7>) -> <v8>
call(sum(x - 1) + x, plus|<v6>, <v7>) -> <v8>
L4:
2 <END>
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: {}
=====================
== A ==
open class A(val a: A)
@@ -125,18 +125,18 @@ class TestOther {
}
---------------------
L0:
1 <START> INIT: in: {} out: {}
v(val x: Int = x + 1) INIT: in: {} out: {x=D}
magic(x) -> <v0> INIT: in: {x=D} out: {x=D} USE: in: {x=READ} out: {x=READ}
r(x|<v0>) -> <v1> USE: in: {} out: {x=READ}
1 <START> INIT: in: {} out: {}
v(val x: Int = x + 1) INIT: in: {} out: {x=D}
magic(x) -> <v0> INIT: in: {x=D} out: {x=D} USE: in: {x=READ} out: {x=READ}
r(x|<v0>) -> <v1> USE: in: {} out: {x=READ}
r(1) -> <v2>
mark(x + 1)
call(+, plus|<v1>, <v2>) -> <v3>
w(x|<v3>) INIT: in: {x=D} out: {x=ID}
call(x + 1, plus|<v1>, <v2>) -> <v3>
w(x|<v3>) INIT: in: {x=D} 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/bugs/referenceToPropertyInitializer.values
+20 -20
View File
@@ -12,16 +12,16 @@ class TestFunctionLiteral {
sum(x - 1) + x
}
---------------------
<v0>: Int NEW: magic(x: Int) -> <v0>
<v1>: TestFunctionLiteral NEW: magic(sum) -> <v1>
sum <v2>: {<: (Int) -> Int} NEW: r(sum|<v1>) -> <v2>
x <v3>: Int NEW: r(x) -> <v3>
1 <v4>: Int NEW: r(1) -> <v4>
x - 1 <v5>: Int NEW: call(-, minus|<v3>, <v4>) -> <v5>
sum(x - 1) <v6>: Int NEW: call(sum, invoke|<v2>, <v5>) -> <v6>
x <v7>: Int NEW: r(x) -> <v7>
sum(x - 1) + x <v8>: Int NEW: call(+, plus|<v6>, <v7>) -> <v8>
sum(x - 1) + x <v8>: Int COPY
<v0>: Int NEW: magic(x: Int) -> <v0>
<v1>: TestFunctionLiteral NEW: magic(sum) -> <v1>
sum <v2>: {<: (Int) -> Int} NEW: r(sum|<v1>) -> <v2>
x <v3>: Int NEW: r(x) -> <v3>
1 <v4>: Int NEW: r(1) -> <v4>
x - 1 <v5>: Int NEW: call(x - 1, minus|<v3>, <v4>) -> <v5>
sum(x - 1) <v6>: Int NEW: call(sum(x - 1), invoke|<v2>, <v5>) -> <v6>
x <v7>: Int NEW: r(x) -> <v7>
sum(x - 1) + x <v8>: Int NEW: call(sum(x - 1) + x, plus|<v6>, <v7>) -> <v8>
sum(x - 1) + x <v8>: Int COPY
=====================
== A ==
open class A(val a: A)
@@ -40,10 +40,10 @@ class TestObjectLiteral {
}
}
---------------------
<v0>: TestObjectLiteral NEW: magic(obj) -> <v0>
<v2>: TestObjectLiteral NEW: magic(obj) -> <v2>
obj <v1>: * NEW: r(obj|<v0>) -> <v1>
obj <v3>: {<: A} NEW: r(obj|<v2>) -> <v3>
<v0>: TestObjectLiteral NEW: magic(obj) -> <v0>
<v2>: TestObjectLiteral NEW: magic(obj) -> <v2>
obj <v1>: * NEW: r(obj|<v0>) -> <v1>
obj <v3>: {<: A} NEW: r(obj|<v2>) -> <v3>
object: A(obj) { { val x = obj } fun foo() { val y = obj } } <v4>: {<: A} NEW: r(object: A(obj) { { val x = obj } fun foo() { val y = obj } }) -> <v4>
=====================
== foo ==
@@ -51,7 +51,7 @@ fun foo() {
val y = obj
}
---------------------
<v0>: TestObjectLiteral NEW: magic(obj) -> <v0>
<v0>: TestObjectLiteral NEW: magic(obj) -> <v0>
obj <v1>: {<: A} NEW: r(obj|<v0>) -> <v1>
=====================
== TestOther ==
@@ -59,8 +59,8 @@ class TestOther {
val x: Int = x + 1
}
---------------------
<v0>: TestOther NEW: magic(x) -> <v0>
x <v1>: Int NEW: r(x|<v0>) -> <v1>
1 <v2>: Int NEW: r(1) -> <v2>
x + 1 <v3>: Int NEW: call(+, plus|<v1>, <v2>) -> <v3>
=====================
<v0>: TestOther NEW: magic(x) -> <v0>
x <v1>: Int NEW: r(x|<v0>) -> <v1>
1 <v2>: Int NEW: r(1) -> <v2>
x + 1 <v3>: Int NEW: call(x + 1, plus|<v1>, <v2>) -> <v3>
=====================
compiler/testData/cfg-variables/bugs/varInitializationInIf.instructions
+2 -2
View File
@@ -18,7 +18,7 @@ L0:
r(1) -> <v0>
r(2) -> <v1>
mark(1 < 2)
call(<, compareTo|<v0>, <v1>) -> <v2>
call(1 < 2, compareTo|<v0>, <v1>) -> <v2>
jf(L2|<v2>)
3 mark({ b = false })
r(false) -> <v3> USE: in: {b=WRITTEN_AFTER_READ} out: {b=WRITTEN_AFTER_READ}
@@ -29,7 +29,7 @@ L2:
r(true) -> <v4> USE: in: {b=WRITTEN_AFTER_READ} out: {b=WRITTEN_AFTER_READ}
w(b|<v4>) INIT: in: {b=D} out: {b=ID} USE: in: {b=READ} out: {b=WRITTEN_AFTER_READ}
L3:
2 error(use, No resolved call) INIT: in: {b=ID} out: {b=ID} USE: in: {b=READ} out: {b=READ}
2 error(use(b), No resolved call) INIT: in: {b=ID} out: {b=ID} USE: in: {b=READ} out: {b=READ}
r(b) -> <v5> USE: in: {} out: {b=READ}
error(use, No resolved call)
mark(use(b))
compiler/testData/cfg-variables/bugs/varInitializationInIf.values
+9 -9
View File
@@ -10,12 +10,12 @@ fun foo() {
use(b)
}
---------------------
1 <v0>: {<: Comparable<Int>} NEW: r(1) -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
1 < 2 <v2>: Boolean NEW: call(<, compareTo|<v0>, <v1>) -> <v2>
false <v3>: Boolean NEW: r(false) -> <v3>
true <v4>: Boolean NEW: r(true) -> <v4>
b <v5>: * NEW: r(b) -> <v5>
use(b) <v6>: * NEW: magic(use(b)|<v5>) -> <v6>
{ val b: Boolean if (1 < 2) { b = false } else { b = true } use(b) } <v6>: * COPY
=====================
1 <v0>: {<: Comparable<Int>} NEW: r(1) -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
1 < 2 <v2>: Boolean NEW: call(1 < 2, compareTo|<v0>, <v1>) -> <v2>
false <v3>: Boolean NEW: r(false) -> <v3>
true <v4>: Boolean NEW: r(true) -> <v4>
b <v5>: * NEW: r(b) -> <v5>
use(b) <v6>: * NEW: magic(use(b)|<v5>) -> <v6>
{ val b: Boolean if (1 < 2) { b = false } else { b = true } use(b) } <v6>: * COPY
=====================
compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.instructions
+2 -2
View File
@@ -34,7 +34,7 @@ L5 [body entry point]:
r(1) -> <v3>
r(2) -> <v4>
mark(1 < 2)
call(<, compareTo|<v3>, <v4>) -> <v5>
call(1 < 2, compareTo|<v3>, <v4>) -> <v5>
jf(L6|<v5>)
5 mark({ b = false })
r(false) -> <v6> USE: in: {b=WRITTEN_AFTER_READ} out: {b=WRITTEN_AFTER_READ}
@@ -47,7 +47,7 @@ L6:
L7:
4 r(b) -> <v8> INIT: in: {b=ID, i=ID, numbers=ID} out: {b=ID, i=ID, numbers=ID} USE: in: {} out: {b=READ}
mark(use(b))
call(use, use|<v8>) -> <v9>
call(use(b), use|<v8>) -> <v9>
jmp(L4 [loop entry point]) USE: in: {} out: {}
- 3 jmp?(L4 [loop entry point])
L2:
compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.values
+11 -11
View File
@@ -14,19 +14,19 @@ fun foo(numbers: Collection<Int>) {
}
---------------------
<v0>: {<: Collection<Int>} NEW: magic(numbers: Collection<Int>) -> <v0>
<v2>: Int NEW: magic(numbers|<v1>) -> <v2>
numbers <v1>: {<: Iterable<Int>} NEW: r(numbers) -> <v1>
1 <v3>: {<: Comparable<Int>} NEW: r(1) -> <v3>
2 <v4>: Int NEW: r(2) -> <v4>
1 < 2 <v5>: Boolean NEW: call(<, compareTo|<v3>, <v4>) -> <v5>
false <v6>: Boolean NEW: r(false) -> <v6>
true <v7>: Boolean NEW: r(true) -> <v7>
b <v8>: {<: Any?} NEW: r(b) -> <v8>
use(b) <v9>: * NEW: call(use, use|<v8>) -> <v9>
<v2>: Int NEW: magic(numbers|<v1>) -> <v2>
numbers <v1>: {<: Iterable<Int>} NEW: r(numbers) -> <v1>
1 <v3>: {<: Comparable<Int>} NEW: r(1) -> <v3>
2 <v4>: Int NEW: r(2) -> <v4>
1 < 2 <v5>: Boolean NEW: call(1 < 2, compareTo|<v3>, <v4>) -> <v5>
false <v6>: Boolean NEW: r(false) -> <v6>
true <v7>: Boolean NEW: r(true) -> <v7>
b <v8>: {<: Any?} NEW: r(b) -> <v8>
use(b) <v9>: * NEW: call(use(b), use|<v8>) -> <v9>
=====================
== use ==
fun use(vararg a: Any?) = a
---------------------
<v0>: {<: Array<Any?>} NEW: magic(vararg a: Any?) -> <v0>
a <v1>: {<: Array<Any?>} NEW: r(a) -> <v1>
=====================
a <v1>: {<: Array<Any?>} NEW: r(a) -> <v1>
=====================