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/lexicalScopes/doWhileScope.instructions
+1 -1
View File
@@ -23,7 +23,7 @@ L5 [condition entry point]:
r(a) -> <v2>
r(0) -> <v3>
mark(a > 0)
call(>, compareTo|<v2>, <v3>) -> <v4>
call(a > 0, compareTo|<v2>, <v3>) -> <v4>
jt(L2 [loop entry point]|<v4>) USE: in: {a=READ} out: {a=READ}
L3 [loop exit point]:
read (Unit)
compiler/testData/cfg-variables/lexicalScopes/doWhileScope.values
+8 -8
View File
@@ -7,11 +7,11 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
a <v2>: {<: Comparable<Int>} NEW: r(a) -> <v2>
0 <v3>: Int NEW: r(0) -> <v3>
a > 0 <v4>: Boolean NEW: call(>, compareTo|<v2>, <v3>) -> <v4>
"after" <v5>: * NEW: r("after") -> <v5>
{ "before" do { var a = 2 } while (a > 0) "after" } <v5>: * COPY
=====================
"before" <v0>: * NEW: r("before") -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
a <v2>: {<: Comparable<Int>} NEW: r(a) -> <v2>
0 <v3>: Int NEW: r(0) -> <v3>
a > 0 <v4>: Boolean NEW: call(a > 0, compareTo|<v2>, <v3>) -> <v4>
"after" <v5>: * NEW: r("after") -> <v5>
{ "before" do { var a = 2 } while (a > 0) "after" } <v5>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/forScope.instructions
+1 -1
View File
@@ -15,7 +15,7 @@ L0:
3 r(1) -> <v1>
r(10) -> <v2>
mark(1..10)
call(.., rangeTo|<v1>, <v2>) -> <v3>
call(1..10, rangeTo|<v1>, <v2>) -> <v3>
v(i) INIT: in: {} out: {i=D}
L3:
jmp?(L2) INIT: in: {i=D} out: {i=D}
compiler/testData/cfg-variables/lexicalScopes/forScope.values
+9 -9
View File
@@ -7,12 +7,12 @@ fun foo() {
"after"
}
---------------------
<v4>: Int NEW: magic(1..10|<v3>) -> <v4>
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
10 <v2>: Int NEW: r(10) -> <v2>
1..10 <v3>: {<: Iterable<Int>} NEW: call(.., rangeTo|<v1>, <v2>) -> <v3>
i <v5>: Int NEW: r(i) -> <v5>
"after" <v6>: * NEW: r("after") -> <v6>
{ "before" for (i in 1..10) { val a = i } "after" } <v6>: * COPY
=====================
<v4>: Int NEW: magic(1..10|<v3>) -> <v4>
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
10 <v2>: Int NEW: r(10) -> <v2>
1..10 <v3>: {<: Iterable<Int>} NEW: call(1..10, rangeTo|<v1>, <v2>) -> <v3>
i <v5>: Int NEW: r(i) -> <v5>
"after" <v6>: * NEW: r("after") -> <v6>
{ "before" for (i in 1..10) { val a = i } "after" } <v6>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.instructions
+13 -13
View File
@@ -38,21 +38,21 @@ sink:
}
---------------------
L3:
3 <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}
4 mark(val a = x + b) INIT: in: {x=ID} out: {x=ID}
v(val a = x + b) INIT: in: {x=ID} out: {a=D, x=ID} USE: in: {b=READ, x=READ} out: {b=READ, x=READ}
r(x) -> <v1> INIT: in: {a=D, x=ID} out: {a=D, x=ID} USE: in: {b=READ} out: {b=READ, x=READ}
r(b) -> <v2> USE: in: {} out: {b=READ}
3 <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}
4 mark(val a = x + b) INIT: in: {x=ID} out: {x=ID}
v(val a = x + b) INIT: in: {x=ID} out: {a=D, x=ID} USE: in: {b=READ, x=READ} out: {b=READ, x=READ}
r(x) -> <v1> INIT: in: {a=D, x=ID} out: {a=D, x=ID} USE: in: {b=READ} out: {b=READ, x=READ}
r(b) -> <v2> USE: in: {} out: {b=READ}
mark(x + b)
call(+, plus|<v1>, <v2>) -> <v3>
w(a|<v3>) INIT: in: {a=D, x=ID} out: {a=ID, x=ID}
call(x + b, plus|<v1>, <v2>) -> <v3>
w(a|<v3>) INIT: in: {a=D, x=ID} out: {a=ID, x=ID}
L4:
3 <END> INIT: in: {x=ID} out: {x=ID}
3 <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/lexicalScopes/functionLiteralScope.values
+9 -9
View File
@@ -8,19 +8,19 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
{ (x: Int) -> val a = x + b } <v2>: {<: (Int) -> Unit} NEW: r({ (x: Int) -> val a = x + b }) -> <v2>
"after" <v3>: * NEW: r("after") -> <v3>
{ "before" val b = 1 val f = { (x: Int) -> val a = x + b } "after" } <v3>: * COPY
"after" <v3>: * NEW: r("after") -> <v3>
{ "before" val b = 1 val f = { (x: Int) -> val a = x + b } "after" } <v3>: * COPY
=====================
== anonymous_0 ==
{ (x: Int) ->
val a = x + b
}
---------------------
<v0>: Int NEW: magic(x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
b <v2>: Int NEW: r(b) -> <v2>
x + b <v3>: Int NEW: call(+, plus|<v1>, <v2>) -> <v3>
=====================
<v0>: Int NEW: magic(x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
b <v2>: Int NEW: r(b) -> <v2>
x + b <v3>: Int NEW: call(x + b, plus|<v1>, <v2>) -> <v3>
=====================
compiler/testData/cfg-variables/lexicalScopes/ifScope.values
+6 -6
View File
@@ -11,9 +11,9 @@ fun foo() {
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
true <v1>: Boolean NEW: r(true) -> <v1>
1 <v2>: Int NEW: r(1) -> <v2>
2 <v3>: Int NEW: r(2) -> <v3>
"after" <v4>: * NEW: r("after") -> <v4>
{ "before" if (true) { val a = 1 } else { val b = 2 } "after" } <v4>: * COPY
=====================
true <v1>: Boolean NEW: r(true) -> <v1>
1 <v2>: Int NEW: r(1) -> <v2>
2 <v3>: Int NEW: r(2) -> <v3>
"after" <v4>: * NEW: r("after") -> <v4>
{ "before" if (true) { val a = 1 } else { val b = 2 } "after" } <v4>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/localClass.values
+7 -7
View File
@@ -13,17 +13,17 @@ fun foo() {
}
---------------------
<v1>: Int NEW: magic(val x: Int) -> <v1>
<v2>: A NEW: magic(x) -> <v2>
"before" <v0>: * NEW: r("before") -> <v0>
x <v3>: Int NEW: r(x|<v2>) -> <v3>
"after" <v4>: * NEW: r("after") -> <v4>
{ "before" class A(val x: Int) { { val a = x } fun foo() { val b = x } } "after" } <v4>: * COPY
<v2>: A NEW: magic(x) -> <v2>
"before" <v0>: * NEW: r("before") -> <v0>
x <v3>: Int NEW: r(x|<v2>) -> <v3>
"after" <v4>: * NEW: r("after") -> <v4>
{ "before" class A(val x: Int) { { val a = x } fun foo() { val b = x } } "after" } <v4>: * COPY
=====================
== foo ==
fun foo() {
val b = x
}
---------------------
<v0>: A NEW: magic(x) -> <v0>
<v0>: A NEW: magic(x) -> <v0>
x <v1>: Int NEW: r(x|<v0>) -> <v1>
=====================
=====================
compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.instructions
+13 -13
View File
@@ -34,21 +34,21 @@ fun local(x: Int) {
}
---------------------
L3:
3 <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}
4 mark({ val a = x + b }) INIT: in: {x=ID} out: {x=ID}
v(val a = x + b) INIT: in: {x=ID} out: {a=D, x=ID} USE: in: {b=READ, x=READ} out: {b=READ, x=READ}
r(x) -> <v1> INIT: in: {a=D, x=ID} out: {a=D, x=ID} USE: in: {b=READ} out: {b=READ, x=READ}
r(b) -> <v2> USE: in: {} out: {b=READ}
3 <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}
4 mark({ val a = x + b }) INIT: in: {x=ID} out: {x=ID}
v(val a = x + b) INIT: in: {x=ID} out: {a=D, x=ID} USE: in: {b=READ, x=READ} out: {b=READ, x=READ}
r(x) -> <v1> INIT: in: {a=D, x=ID} out: {a=D, x=ID} USE: in: {b=READ} out: {b=READ, x=READ}
r(b) -> <v2> USE: in: {} out: {b=READ}
mark(x + b)
call(+, plus|<v1>, <v2>) -> <v3>
w(a|<v3>) INIT: in: {a=D, x=ID} out: {a=ID, x=ID}
call(x + b, plus|<v1>, <v2>) -> <v3>
w(a|<v3>) INIT: in: {a=D, x=ID} out: {a=ID, x=ID}
L4:
3 <END> INIT: in: {x=ID} out: {x=ID}
3 <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/lexicalScopes/localFunctionScope.values
+8 -8
View File
@@ -9,17 +9,17 @@ fun foo() {
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" val b = 1 fun local(x: Int) { val a = x + b } "after" } <v2>: * COPY
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" val b = 1 fun local(x: Int) { val a = x + b } "after" } <v2>: * COPY
=====================
== local ==
fun local(x: Int) {
val a = x + b
}
---------------------
<v0>: Int NEW: magic(x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
b <v2>: Int NEW: r(b) -> <v2>
x + b <v3>: Int NEW: call(+, plus|<v1>, <v2>) -> <v3>
=====================
<v0>: Int NEW: magic(x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
b <v2>: Int NEW: r(b) -> <v2>
x + b <v3>: Int NEW: call(x + b, plus|<v1>, <v2>) -> <v3>
=====================
compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.instructions
+9 -9
View File
@@ -30,18 +30,18 @@ sink:
fun local(x: Int) = x + b
---------------------
L3:
3 <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} USE: in: {b=READ, x=READ} out: {b=READ, x=READ}
r(x) -> <v1> INIT: in: {x=ID} out: {x=ID} USE: in: {b=READ} out: {b=READ, x=READ}
r(b) -> <v2> USE: in: {} out: {b=READ}
3 <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} USE: in: {b=READ, x=READ} out: {b=READ, x=READ}
r(x) -> <v1> INIT: in: {x=ID} out: {x=ID} USE: in: {b=READ} out: {b=READ, x=READ}
r(b) -> <v2> USE: in: {} out: {b=READ}
mark(x + b)
call(+, plus|<v1>, <v2>) -> <v3>
call(x + b, plus|<v1>, <v2>) -> <v3>
L4:
<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: {}
=====================
compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.values
+8 -8
View File
@@ -7,15 +7,15 @@ fun foo() {
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" val b = 1 fun local(x: Int) = x + b "after" } <v2>: * COPY
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" val b = 1 fun local(x: Int) = x + b "after" } <v2>: * COPY
=====================
== local ==
fun local(x: Int) = x + b
---------------------
<v0>: Int NEW: magic(x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
b <v2>: Int NEW: r(b) -> <v2>
x + b <v3>: Int NEW: call(+, plus|<v1>, <v2>) -> <v3>
=====================
<v0>: Int NEW: magic(x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
b <v2>: Int NEW: r(b) -> <v2>
x + b <v3>: Int NEW: call(x + b, plus|<v1>, <v2>) -> <v3>
=====================
compiler/testData/cfg-variables/lexicalScopes/localObject.values
+4 -4
View File
@@ -13,9 +13,9 @@ fun foo() {
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" object A { { val a = 1 } fun foo() { val b = 2 } } "after" } <v2>: * COPY
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" object A { { val a = 1 } fun foo() { val b = 2 } } "after" } <v2>: * COPY
=====================
== foo ==
fun foo() {
@@ -23,4 +23,4 @@ fun foo() {
}
---------------------
2 <v0>: Int NEW: r(2) -> <v0>
=====================
=====================
compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.values
+5 -5
View File
@@ -12,11 +12,11 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
object { { val x = 1 } fun foo() { val a = 2 } } <v2>: <no name provided> NEW: r(object { { val x = 1 } fun foo() { val a = 2 } }) -> <v2>
"after" <v3>: * NEW: r("after") -> <v3>
{ "before" val bar = object { { val x = 1 } fun foo() { val a = 2 } } "after" } <v3>: * COPY
"after" <v3>: * NEW: r("after") -> <v3>
{ "before" val bar = object { { val x = 1 } fun foo() { val a = 2 } } "after" } <v3>: * COPY
=====================
== foo ==
fun foo() {
@@ -24,4 +24,4 @@ fun foo() {
}
---------------------
2 <v0>: Int NEW: r(2) -> <v0>
=====================
=====================
compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.values
+4 -4
View File
@@ -17,7 +17,7 @@ get() {
return $a
}
---------------------
<v0>: A NEW: magic($a) -> <v0>
<v0>: A NEW: magic($a) -> <v0>
$a <v1>: Int NEW: r($a|<v0>) -> <v1>
=====================
== set_a ==
@@ -26,6 +26,6 @@ set(v: Int) {
}
---------------------
<v0>: Int NEW: magic(v: Int) -> <v0>
<v1>: A NEW: magic($a) -> <v1>
v <v2>: Int NEW: r(v) -> <v2>
=====================
<v1>: A NEW: magic($a) -> <v1>
v <v2>: Int NEW: r(v) -> <v2>
=====================
compiler/testData/cfg-variables/lexicalScopes/tryScope.instructions
+1 -1
View File
@@ -23,7 +23,7 @@ L0:
jmp?(L3 [onExceptionToFinallyBlock])
3 mark({ foo() })
mark(foo())
call(foo, foo) -> <v1>
call(foo(), foo) -> <v1>
2 jmp(L4 [afterCatches]) USE: in: {} out: {}
L2 [onException]:
3 v(e: Exception) INIT: in: {} out: {e=D}
compiler/testData/cfg-variables/lexicalScopes/tryScope.values
+9 -9
View File
@@ -14,12 +14,12 @@ fun foo() {
}
---------------------
<v2>: {<: Exception} NEW: magic(e: Exception) -> <v2>
"before" <v0>: * NEW: r("before") -> <v0>
foo() <v1>: * NEW: call(foo, foo) -> <v1>
{ foo() } <v1>: * COPY
e <v3>: {<: Exception} NEW: r(e) -> <v3>
1 <v4>: Int NEW: r(1) -> <v4>
try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } <v1>: * COPY
"after" <v5>: * NEW: r("after") -> <v5>
{ "before" try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } "after" } <v5>: * COPY
=====================
"before" <v0>: * NEW: r("before") -> <v0>
foo() <v1>: * NEW: call(foo(), foo) -> <v1>
{ foo() } <v1>: * COPY
e <v3>: {<: Exception} NEW: r(e) -> <v3>
1 <v4>: Int NEW: r(1) -> <v4>
try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } <v1>: * COPY
"after" <v5>: * NEW: r("after") -> <v5>
{ "before" try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } "after" } <v5>: * COPY
=====================