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/controlStructures/Finally.instructions
+37 -37
View File
@@ -54,7 +54,7 @@ L0:
r(2) -> <v1>
r(3) -> <v2>
mark(2 > 3)
call(>, compareTo|<v1>, <v2>) -> <v3>
call(2 > 3, compareTo|<v1>, <v2>) -> <v3>
jf(L3|<v3>) NEXT:[read (Unit), mark({ return })]
4 mark({ return })
L4 [start finally]:
@@ -139,20 +139,20 @@ L4:
r(2) -> <v0>
r(3) -> <v1>
mark(2 > 3)
call(>, compareTo|<v0>, <v1>) -> <v2>
jf(L6|<v2>) NEXT:[read (Unit), mark({ return@l })]
call(2 > 3, compareTo|<v0>, <v1>) -> <v2>
jf(L6|<v2>) NEXT:[read (Unit), mark({ return@l })]
6 mark({ return@l })
ret L5 NEXT:[<END>]
- 5 jmp(L7) NEXT:[<END>] PREV:[]
ret L5 NEXT:[<END>]
- 5 jmp(L7) NEXT:[<END>] PREV:[]
L6:
read (Unit) PREV:[jf(L6|<v2>)]
read (Unit) PREV:[jf(L6|<v2>)]
L5:
L7:
4 <END> NEXT:[<SINK>] PREV:[ret L5, read (Unit)]
4 <END> NEXT:[<SINK>] PREV:[ret L5, read (Unit)]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
<SINK> PREV:[<ERROR>, <END>]
=====================
== t4 ==
fun t4() {
@@ -207,7 +207,7 @@ L3:
r(2) -> <v1>
r(3) -> <v2>
mark(2 > 3)
call(>, compareTo|<v1>, <v2>) -> <v3>
call(2 > 3, compareTo|<v1>, <v2>) -> <v3>
jf(L6|<v3>) NEXT:[read (Unit), mark({ return@l })]
6 mark({ return@l })
L7 [start finally]:
@@ -266,7 +266,7 @@ L4 [body entry point]:
r(2) -> <v2>
r(3) -> <v3>
mark(2 > 3)
call(>, compareTo|<v2>, <v3>) -> <v4>
call(2 > 3, compareTo|<v2>, <v3>) -> <v4>
jf(L7|<v4>) NEXT:[read (Unit), mark({ break @l })]
5 mark({ break @l })
L8 [start finally]:
@@ -329,7 +329,7 @@ L5 [body entry point]:
r(2) -> <v2>
r(3) -> <v3>
mark(2 > 3)
call(>, compareTo|<v2>, <v3>) -> <v4>
call(2 > 3, compareTo|<v2>, <v3>) -> <v4>
jf(L7|<v4>) NEXT:[read (Unit), mark({ break @l })]
5 mark({ break @l })
jmp(L4 [loop exit point]) NEXT:[read (Unit)]
@@ -390,7 +390,7 @@ L5 [body entry point]:
r(2) -> <v2>
r(3) -> <v3>
mark(2 > 3)
call(>, compareTo|<v2>, <v3>) -> <v4>
call(2 > 3, compareTo|<v2>, <v3>) -> <v4>
jf(L7|<v4>) NEXT:[read (Unit), mark({ break @l })]
5 mark({ break @l })
jmp(L4 [loop exit point]) NEXT:[read (Unit)]
@@ -442,7 +442,7 @@ L0:
3 r(1) -> <v1>
r(a) -> <v2>
mark(1..a)
call(.., rangeTo|<v1>, <v2>) -> <v3>
call(1..a, rangeTo|<v1>, <v2>) -> <v3>
v(i)
L3:
jmp?(L2) NEXT:[read (Unit), magic(1..a|<v3>) -> <v4>]
@@ -460,7 +460,7 @@ L5 [body entry point]:
r(2) -> <v6>
r(3) -> <v7>
mark(2 > 3)
call(>, compareTo|<v6>, <v7>) -> <v8>
call(2 > 3, compareTo|<v6>, <v7>) -> <v8>
jf(L7|<v8>) NEXT:[read (Unit), mark({ continue @l })]
6 mark({ continue @l })
L8 [start finally]:
@@ -518,7 +518,7 @@ L0:
4 r(1) -> <v1>
r(a) -> <v2>
mark(1..a)
call(.., rangeTo|<v1>, <v2>) -> <v3>
call(1..a, rangeTo|<v1>, <v2>) -> <v3>
v(i)
L4:
jmp?(L3) NEXT:[read (Unit), magic(1..a|<v3>) -> <v4>]
@@ -533,7 +533,7 @@ L6 [body entry point]:
r(2) -> <v6>
r(3) -> <v7>
mark(2 > 3)
call(>, compareTo|<v6>, <v7>) -> <v8>
call(2 > 3, compareTo|<v6>, <v7>) -> <v8>
jf(L7|<v8>) NEXT:[read (Unit), mark({ continue @l })]
6 mark({ continue @l })
jmp(L5 [loop entry point]) NEXT:[magic(1..a|<v3>) -> <v4>]
@@ -589,7 +589,7 @@ L0:
4 r(1) -> <v1>
r(a) -> <v2>
mark(1..a)
call(.., rangeTo|<v1>, <v2>) -> <v3>
call(1..a, rangeTo|<v1>, <v2>) -> <v3>
v(i)
L4:
jmp?(L3) NEXT:[read (Unit), magic(1..a|<v3>) -> <v4>]
@@ -604,7 +604,7 @@ L6 [body entry point]:
r(2) -> <v6>
r(3) -> <v7>
mark(2 > 3)
call(>, compareTo|<v6>, <v7>) -> <v8>
call(2 > 3, compareTo|<v6>, <v7>) -> <v8>
jf(L7|<v8>) NEXT:[read (Unit), mark({ continue @l })]
6 mark({ continue @l })
jmp(L5 [loop entry point]) NEXT:[magic(1..a|<v3>) -> <v4>]
@@ -693,7 +693,7 @@ L3 [start finally]:
4 mark({ doSmth(3) })
r(3) -> <v1>
mark(doSmth(3))
call(doSmth, doSmth|<v1>) -> <v2>
call(doSmth(3), doSmth|<v1>) -> <v2>
L4 [finish finally]:
3 ret(*|<v0>) L1 NEXT:[<END>]
- 2 jmp(L5 [skipFinallyToErrorBlock]) NEXT:[mark({ doSmth(3) })] PREV:[]
@@ -701,13 +701,13 @@ L2 [onExceptionToFinallyBlock]:
4 mark({ doSmth(3) }) PREV:[jmp?(L2 [onExceptionToFinallyBlock])]
r(3) -> <v1>
mark(doSmth(3))
call(doSmth, doSmth|<v1>) -> <v2>
call(doSmth(3), doSmth|<v1>) -> <v2>
2 jmp(error) NEXT:[<ERROR>]
L5 [skipFinallyToErrorBlock]:
- 4 mark({ doSmth(3) }) PREV:[]
- r(3) -> <v1> PREV:[]
- mark(doSmth(3)) PREV:[]
- call(doSmth, doSmth|<v1>) -> <v2> PREV:[]
- call(doSmth(3), doSmth|<v1>) -> <v2> PREV:[]
L1:
1 <END> NEXT:[<SINK>] PREV:[ret(*|<v0>) L1]
error:
@@ -740,7 +740,7 @@ L4 [start finally]:
4 mark({ doSmth(3) })
r(3) -> <v1>
mark(doSmth(3))
call(doSmth, doSmth|<v1>) -> <v2>
call(doSmth(3), doSmth|<v1>) -> <v2>
L5 [finish finally]:
3 ret(*|<v0>) L1 NEXT:[<END>]
- 2 jmp(L6 [afterCatches]) NEXT:[jmp(L7 [skipFinallyToErrorBlock])] PREV:[]
@@ -751,7 +751,7 @@ L2 [onException]:
4 mark({ doSmth(2) })
r(2) -> <v4>
mark(doSmth(2))
call(doSmth, doSmth|<v4>) -> <v5>
call(doSmth(2), doSmth|<v4>) -> <v5>
3 jmp(L6 [afterCatches])
L6 [afterCatches]:
2 jmp(L7 [skipFinallyToErrorBlock]) NEXT:[mark({ doSmth(3) })]
@@ -759,15 +759,15 @@ L3 [onExceptionToFinallyBlock]:
4 mark({ doSmth(3) }) PREV:[jmp?(L3 [onExceptionToFinallyBlock])]
r(3) -> <v1>
mark(doSmth(3))
call(doSmth, doSmth|<v1>) -> <v2>
call(doSmth(3), doSmth|<v1>) -> <v2>
2 jmp(error) NEXT:[<ERROR>]
L7 [skipFinallyToErrorBlock]:
4 mark({ doSmth(3) }) PREV:[jmp(L7 [skipFinallyToErrorBlock])]
r(3) -> <v1>
mark(doSmth(3))
call(doSmth, doSmth|<v1>) -> <v2>
call(doSmth(3), doSmth|<v1>) -> <v2>
L1:
1 <END> NEXT:[<SINK>] PREV:[ret(*|<v0>) L1, call(doSmth, doSmth|<v1>) -> <v2>]
1 <END> NEXT:[<SINK>] PREV:[ret(*|<v0>) L1, call(doSmth(3), doSmth|<v1>) -> <v2>]
error:
<ERROR> PREV:[jmp(error)]
sink:
@@ -799,7 +799,7 @@ L2 [onException]:
4 mark({ doSmth(2) })
r(2) -> <v2>
mark(doSmth(2))
call(doSmth, doSmth|<v2>) -> <v3>
call(doSmth(2), doSmth|<v2>) -> <v3>
3 jmp(L3 [afterCatches])
L1:
L3 [afterCatches]:
@@ -834,7 +834,7 @@ L4 [start finally]:
4 mark({ doSmth(3) })
r(3) -> <v1>
mark(doSmth(3))
call(doSmth, doSmth|<v1>) -> <v2>
call(doSmth(3), doSmth|<v1>) -> <v2>
L5 [finish finally]:
3 ret(*|<v0>) L1 NEXT:[<END>]
- 2 jmp(L6 [afterCatches]) NEXT:[jmp(L7 [skipFinallyToErrorBlock])] PREV:[]
@@ -847,7 +847,7 @@ L2 [onException]:
mark({ doSmth(3) })
r(3) -> <v1>
mark(doSmth(3))
call(doSmth, doSmth|<v1>) -> <v2>
call(doSmth(3), doSmth|<v1>) -> <v2>
ret(*|<v4>) L1 NEXT:[<END>]
- 3 jmp(L6 [afterCatches]) PREV:[]
L6 [afterCatches]:
@@ -856,13 +856,13 @@ L3 [onExceptionToFinallyBlock]:
4 mark({ doSmth(3) }) PREV:[jmp?(L3 [onExceptionToFinallyBlock])]
r(3) -> <v1>
mark(doSmth(3))
call(doSmth, doSmth|<v1>) -> <v2>
call(doSmth(3), doSmth|<v1>) -> <v2>
2 jmp(error) NEXT:[<ERROR>]
L7 [skipFinallyToErrorBlock]:
- 4 mark({ doSmth(3) }) PREV:[]
- r(3) -> <v1> PREV:[]
- mark(doSmth(3)) PREV:[]
- call(doSmth, doSmth|<v1>) -> <v2> PREV:[]
- call(doSmth(3), doSmth|<v1>) -> <v2> PREV:[]
L1:
1 <END> NEXT:[<SINK>] PREV:[ret(*|<v0>) L1, ret(*|<v4>) L1]
error:
@@ -892,7 +892,7 @@ L0:
3 mark({ doSmth(1) })
r(1) -> <v0>
mark(doSmth(1))
call(doSmth, doSmth|<v0>) -> <v1>
call(doSmth(1), doSmth|<v0>) -> <v1>
2 jmp(L4 [afterCatches]) NEXT:[jmp(L7 [skipFinallyToErrorBlock])]
L2 [onException]:
3 v(e: UnsupportedOperationException) PREV:[jmp?(L2 [onException])]
@@ -904,7 +904,7 @@ L5 [start finally]:
5 mark({ doSmth(3) })
r(3) -> <v4>
mark(doSmth(3))
call(doSmth, doSmth|<v4>) -> <v5>
call(doSmth(3), doSmth|<v4>) -> <v5>
L6 [finish finally]:
4 ret(*|<v3>) L1 NEXT:[<END>]
- 3 jmp(L4 [afterCatches]) PREV:[]
@@ -914,15 +914,15 @@ L3 [onExceptionToFinallyBlock]:
5 mark({ doSmth(3) }) PREV:[jmp?(L3 [onExceptionToFinallyBlock])]
r(3) -> <v4>
mark(doSmth(3))
call(doSmth, doSmth|<v4>) -> <v5>
call(doSmth(3), doSmth|<v4>) -> <v5>
2 jmp(error) NEXT:[<ERROR>]
L7 [skipFinallyToErrorBlock]:
5 mark({ doSmth(3) }) PREV:[jmp(L7 [skipFinallyToErrorBlock])]
r(3) -> <v4>
mark(doSmth(3))
call(doSmth, doSmth|<v4>) -> <v5>
call(doSmth(3), doSmth|<v4>) -> <v5>
L1:
1 <END> NEXT:[<SINK>] PREV:[ret(*|<v3>) L1, call(doSmth, doSmth|<v4>) -> <v5>]
1 <END> NEXT:[<SINK>] PREV:[ret(*|<v3>) L1, call(doSmth(3), doSmth|<v4>) -> <v5>]
error:
<ERROR> PREV:[jmp(error)]
sink:
compiler/testData/cfg/controlStructures/Finally.values
+123 -123
View File
@@ -8,11 +8,11 @@ fun t1() {
}
---------------------
1 <v0>: * NEW: r(1) -> <v0>
{ 1 } <v0>: * COPY
{ 1 } <v0>: * COPY
2 <v1>: * NEW: r(2) -> <v1>
{ 2 } <v1>: * COPY
try { 1 } finally { 2 } <v0>: * COPY
{ try { 1 } finally { 2 } } <v0>: * COPY
{ 2 } <v1>: * COPY
try { 1 } finally { 2 } <v0>: * COPY
{ try { 1 } finally { 2 } } <v0>: * COPY
=====================
== t2 ==
fun t2() {
@@ -26,12 +26,12 @@ fun t2() {
}
}
---------------------
1 <v0>: * NEW: r(1) -> <v0>
2 <v1>: {<: Comparable<Int>} NEW: r(2) -> <v1>
3 <v2>: Int NEW: r(3) -> <v2>
2 > 3 <v3>: Boolean NEW: call(>, compareTo|<v1>, <v2>) -> <v3>
2 <v4>: * NEW: r(2) -> <v4>
{ 2 } <v4>: * COPY
1 <v0>: * NEW: r(1) -> <v0>
2 <v1>: {<: Comparable<Int>} NEW: r(2) -> <v1>
3 <v2>: Int NEW: r(3) -> <v2>
2 > 3 <v3>: Boolean NEW: call(2 > 3, compareTo|<v1>, <v2>) -> <v3>
2 <v4>: * NEW: r(2) -> <v4>
{ 2 } <v4>: * COPY
=====================
== t3 ==
fun t3() {
@@ -47,14 +47,14 @@ fun t3() {
}
}
---------------------
1 <v0>: * NEW: r(1) -> <v0>
1 <v0>: * NEW: r(1) -> <v0>
{ () -> if (2 > 3) { return@l } } <v1>: * NEW: r({ () -> if (2 > 3) { return@l } }) -> <v1>
@l{ () -> if (2 > 3) { return@l } } <v1>: * COPY
{ 1 @l{ () -> if (2 > 3) { return@l } } } <v1>: * COPY
2 <v2>: * NEW: r(2) -> <v2>
{ 2 } <v2>: * COPY
try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } <v1>: * COPY
{ try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } } <v1>: * COPY
@l{ () -> if (2 > 3) { return@l } } <v1>: * COPY
{ 1 @l{ () -> if (2 > 3) { return@l } } } <v1>: * COPY
2 <v2>: * NEW: r(2) -> <v2>
{ 2 } <v2>: * COPY
try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } <v1>: * COPY
{ try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } } <v1>: * COPY
=====================
== anonymous_0 ==
{ () ->
@@ -63,9 +63,9 @@ try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } <v1>: * COPY
}
}
---------------------
2 <v0>: {<: Comparable<Int>} NEW: r(2) -> <v0>
3 <v1>: Int NEW: r(3) -> <v1>
2 > 3 <v2>: Boolean NEW: call(>, compareTo|<v0>, <v1>) -> <v2>
2 <v0>: {<: Comparable<Int>} NEW: r(2) -> <v0>
3 <v1>: Int NEW: r(3) -> <v1>
2 > 3 <v2>: Boolean NEW: call(2 > 3, compareTo|<v0>, <v1>) -> <v2>
=====================
== t4 ==
fun t4() {
@@ -82,8 +82,8 @@ fun t4() {
}
---------------------
{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } <v0>: * NEW: r({ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } }) -> <v0>
@l{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } <v0>: * COPY
{ @l{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } } <v0>: * COPY
@l{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } <v0>: * COPY
{ @l{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } } <v0>: * COPY
=====================
== anonymous_1 ==
{ () ->
@@ -97,12 +97,12 @@ fun t4() {
}
}
---------------------
1 <v0>: * NEW: r(1) -> <v0>
2 <v1>: {<: Comparable<Int>} NEW: r(2) -> <v1>
3 <v2>: Int NEW: r(3) -> <v2>
2 > 3 <v3>: Boolean NEW: call(>, compareTo|<v1>, <v2>) -> <v3>
2 <v4>: * NEW: r(2) -> <v4>
{ 2 } <v4>: * COPY
1 <v0>: * NEW: r(1) -> <v0>
2 <v1>: {<: Comparable<Int>} NEW: r(2) -> <v1>
3 <v2>: Int NEW: r(3) -> <v2>
2 > 3 <v3>: Boolean NEW: call(2 > 3, compareTo|<v1>, <v2>) -> <v3>
2 <v4>: * NEW: r(2) -> <v4>
{ 2 } <v4>: * COPY
=====================
== t5 ==
fun t5() {
@@ -118,13 +118,13 @@ fun t5() {
}
}
---------------------
true <v0>: * NEW: r(true) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
2 <v2>: {<: Comparable<Int>} NEW: r(2) -> <v2>
3 <v3>: Int NEW: r(3) -> <v3>
2 > 3 <v4>: Boolean NEW: call(>, compareTo|<v2>, <v3>) -> <v4>
2 <v5>: * NEW: r(2) -> <v5>
{ 2 } <v5>: * COPY
true <v0>: * NEW: r(true) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
2 <v2>: {<: Comparable<Int>} NEW: r(2) -> <v2>
3 <v3>: Int NEW: r(3) -> <v3>
2 > 3 <v4>: Boolean NEW: call(2 > 3, compareTo|<v2>, <v3>) -> <v4>
2 <v5>: * NEW: r(2) -> <v5>
{ 2 } <v5>: * COPY
=====================
== t6 ==
fun t6() {
@@ -141,17 +141,17 @@ fun t6() {
}
}
---------------------
true <v0>: * NEW: r(true) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
2 <v2>: {<: Comparable<Int>} NEW: r(2) -> <v2>
3 <v3>: Int NEW: r(3) -> <v3>
2 > 3 <v4>: Boolean NEW: call(>, compareTo|<v2>, <v3>) -> <v4>
5 <v5>: * NEW: r(5) -> <v5>
{ @l while(true) { 1 if (2 > 3) { break @l } } 5 } <v5>: * COPY
2 <v6>: * NEW: r(2) -> <v6>
{ 2 } <v6>: * COPY
try { @l while(true) { 1 if (2 > 3) { break @l } } 5 } finally { 2 } <v5>: * COPY
{ try { @l while(true) { 1 if (2 > 3) { break @l } } 5 } finally { 2 } } <v5>: * COPY
true <v0>: * NEW: r(true) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
2 <v2>: {<: Comparable<Int>} NEW: r(2) -> <v2>
3 <v3>: Int NEW: r(3) -> <v3>
2 > 3 <v4>: Boolean NEW: call(2 > 3, compareTo|<v2>, <v3>) -> <v4>
5 <v5>: * NEW: r(5) -> <v5>
{ @l while(true) { 1 if (2 > 3) { break @l } } 5 } <v5>: * COPY
2 <v6>: * NEW: r(2) -> <v6>
{ 2 } <v6>: * COPY
try { @l while(true) { 1 if (2 > 3) { break @l } } 5 } finally { 2 } <v5>: * COPY
{ try { @l while(true) { 1 if (2 > 3) { break @l } } 5 } finally { 2 } } <v5>: * COPY
=====================
== t7 ==
fun t7() {
@@ -167,13 +167,13 @@ fun t7() {
}
}
---------------------
true <v0>: * NEW: r(true) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
2 <v2>: {<: Comparable<Int>} NEW: r(2) -> <v2>
3 <v3>: Int NEW: r(3) -> <v3>
2 > 3 <v4>: Boolean NEW: call(>, compareTo|<v2>, <v3>) -> <v4>
2 <v5>: * NEW: r(2) -> <v5>
{ 2 } <v5>: * COPY
true <v0>: * NEW: r(true) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
2 <v2>: {<: Comparable<Int>} NEW: r(2) -> <v2>
3 <v3>: Int NEW: r(3) -> <v3>
2 > 3 <v4>: Boolean NEW: call(2 > 3, compareTo|<v2>, <v3>) -> <v4>
2 <v5>: * NEW: r(2) -> <v5>
{ 2 } <v5>: * COPY
=====================
== t8 ==
fun t8(a : Int) {
@@ -189,17 +189,17 @@ fun t8(a : Int) {
}
}
---------------------
<v0>: Int NEW: magic(a : Int) -> <v0>
<v4>: Int NEW: magic(1..a|<v3>) -> <v4>
1 <v1>: Int NEW: r(1) -> <v1>
a <v2>: Int NEW: r(a) -> <v2>
1..a <v3>: {<: Iterable<Int>} NEW: call(.., rangeTo|<v1>, <v2>) -> <v3>
1 <v5>: * NEW: r(1) -> <v5>
2 <v6>: {<: Comparable<Int>} NEW: r(2) -> <v6>
3 <v7>: Int NEW: r(3) -> <v7>
2 > 3 <v8>: Boolean NEW: call(>, compareTo|<v6>, <v7>) -> <v8>
2 <v9>: * NEW: r(2) -> <v9>
{ 2 } <v9>: * COPY
<v0>: Int NEW: magic(a : Int) -> <v0>
<v4>: Int NEW: magic(1..a|<v3>) -> <v4>
1 <v1>: Int NEW: r(1) -> <v1>
a <v2>: Int NEW: r(a) -> <v2>
1..a <v3>: {<: Iterable<Int>} NEW: call(1..a, rangeTo|<v1>, <v2>) -> <v3>
1 <v5>: * NEW: r(1) -> <v5>
2 <v6>: {<: Comparable<Int>} NEW: r(2) -> <v6>
3 <v7>: Int NEW: r(3) -> <v7>
2 > 3 <v8>: Boolean NEW: call(2 > 3, compareTo|<v6>, <v7>) -> <v8>
2 <v9>: * NEW: r(2) -> <v9>
{ 2 } <v9>: * COPY
=====================
== t9 ==
fun t9(a : Int) {
@@ -216,21 +216,21 @@ fun t9(a : Int) {
}
}
---------------------
<v0>: Int NEW: magic(a : Int) -> <v0>
<v4>: Int NEW: magic(1..a|<v3>) -> <v4>
1 <v1>: Int NEW: r(1) -> <v1>
a <v2>: Int NEW: r(a) -> <v2>
1..a <v3>: {<: Iterable<Int>} NEW: call(.., rangeTo|<v1>, <v2>) -> <v3>
1 <v5>: * NEW: r(1) -> <v5>
2 <v6>: {<: Comparable<Int>} NEW: r(2) -> <v6>
3 <v7>: Int NEW: r(3) -> <v7>
2 > 3 <v8>: Boolean NEW: call(>, compareTo|<v6>, <v7>) -> <v8>
5 <v9>: * NEW: r(5) -> <v9>
{ @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } <v9>: * COPY
2 <v10>: * NEW: r(2) -> <v10>
{ 2 } <v10>: * COPY
try { @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } finally { 2 } <v9>: * COPY
{ try { @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } finally { 2 } } <v9>: * COPY
<v0>: Int NEW: magic(a : Int) -> <v0>
<v4>: Int NEW: magic(1..a|<v3>) -> <v4>
1 <v1>: Int NEW: r(1) -> <v1>
a <v2>: Int NEW: r(a) -> <v2>
1..a <v3>: {<: Iterable<Int>} NEW: call(1..a, rangeTo|<v1>, <v2>) -> <v3>
1 <v5>: * NEW: r(1) -> <v5>
2 <v6>: {<: Comparable<Int>} NEW: r(2) -> <v6>
3 <v7>: Int NEW: r(3) -> <v7>
2 > 3 <v8>: Boolean NEW: call(2 > 3, compareTo|<v6>, <v7>) -> <v8>
5 <v9>: * NEW: r(5) -> <v9>
{ @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } <v9>: * COPY
2 <v10>: * NEW: r(2) -> <v10>
{ 2 } <v10>: * COPY
try { @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } finally { 2 } <v9>: * COPY
{ try { @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } finally { 2 } } <v9>: * COPY
=====================
== t10 ==
fun t10(a : Int) {
@@ -246,17 +246,17 @@ fun t10(a : Int) {
}
}
---------------------
<v0>: Int NEW: magic(a : Int) -> <v0>
<v4>: Int NEW: magic(1..a|<v3>) -> <v4>
1 <v1>: Int NEW: r(1) -> <v1>
a <v2>: Int NEW: r(a) -> <v2>
1..a <v3>: {<: Iterable<Int>} NEW: call(.., rangeTo|<v1>, <v2>) -> <v3>
1 <v5>: * NEW: r(1) -> <v5>
2 <v6>: {<: Comparable<Int>} NEW: r(2) -> <v6>
3 <v7>: Int NEW: r(3) -> <v7>
2 > 3 <v8>: Boolean NEW: call(>, compareTo|<v6>, <v7>) -> <v8>
2 <v9>: * NEW: r(2) -> <v9>
{ 2 } <v9>: * COPY
<v0>: Int NEW: magic(a : Int) -> <v0>
<v4>: Int NEW: magic(1..a|<v3>) -> <v4>
1 <v1>: Int NEW: r(1) -> <v1>
a <v2>: Int NEW: r(a) -> <v2>
1..a <v3>: {<: Iterable<Int>} NEW: call(1..a, rangeTo|<v1>, <v2>) -> <v3>
1 <v5>: * NEW: r(1) -> <v5>
2 <v6>: {<: Comparable<Int>} NEW: r(2) -> <v6>
3 <v7>: Int NEW: r(3) -> <v7>
2 > 3 <v8>: Boolean NEW: call(2 > 3, compareTo|<v6>, <v7>) -> <v8>
2 <v9>: * NEW: r(2) -> <v9>
{ 2 } <v9>: * COPY
=====================
== t11 ==
fun t11() {
@@ -281,10 +281,10 @@ fun t12() : Int {
}
}
---------------------
1 <v0>: Int NEW: r(1) -> <v0>
3 <v1>: Int NEW: r(3) -> <v1>
doSmth(3) <v2>: * NEW: call(doSmth, doSmth|<v1>) -> <v2>
{ doSmth(3) } <v2>: * COPY
1 <v0>: Int NEW: r(1) -> <v0>
3 <v1>: Int NEW: r(3) -> <v1>
doSmth(3) <v2>: * NEW: call(doSmth(3), doSmth|<v1>) -> <v2>
{ doSmth(3) } <v2>: * COPY
=====================
== t13 ==
fun t13() : Int {
@@ -300,15 +300,15 @@ fun t13() : Int {
}
---------------------
<v3>: {<: UnsupportedOperationException} NEW: magic(e: UnsupportedOperationException) -> <v3>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v4>: Int NEW: r(2) -> <v4>
doSmth(2) <v5>: * NEW: call(doSmth, doSmth|<v4>) -> <v5>
{ doSmth(2) } <v5>: * COPY
3 <v1>: Int NEW: r(3) -> <v1>
doSmth(3) <v2>: * NEW: call(doSmth, doSmth|<v1>) -> <v2>
{ doSmth(3) } <v2>: * COPY
try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } finally { doSmth(3) } <v5>: * COPY
{ try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } finally { doSmth(3) } } <v5>: * COPY
1 <v0>: Int NEW: r(1) -> <v0>
2 <v4>: Int NEW: r(2) -> <v4>
doSmth(2) <v5>: * NEW: call(doSmth(2), doSmth|<v4>) -> <v5>
{ doSmth(2) } <v5>: * COPY
3 <v1>: Int NEW: r(3) -> <v1>
doSmth(3) <v2>: * NEW: call(doSmth(3), doSmth|<v1>) -> <v2>
{ doSmth(3) } <v2>: * COPY
try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } finally { doSmth(3) } <v5>: * COPY
{ try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } finally { doSmth(3) } } <v5>: * COPY
=====================
== t14 ==
fun t14() : Int {
@@ -321,12 +321,12 @@ fun t14() : Int {
}
---------------------
<v1>: {<: UnsupportedOperationException} NEW: magic(e: UnsupportedOperationException) -> <v1>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v2>: Int NEW: r(2) -> <v2>
doSmth(2) <v3>: * NEW: call(doSmth, doSmth|<v2>) -> <v3>
{ doSmth(2) } <v3>: * COPY
try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } <v3>: * COPY
{ try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } } <v3>: * COPY
1 <v0>: Int NEW: r(1) -> <v0>
2 <v2>: Int NEW: r(2) -> <v2>
doSmth(2) <v3>: * NEW: call(doSmth(2), doSmth|<v2>) -> <v3>
{ doSmth(2) } <v3>: * COPY
try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } <v3>: * COPY
{ try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } } <v3>: * COPY
=====================
== t15 ==
fun t15() : Int {
@@ -342,11 +342,11 @@ fun t15() : Int {
}
---------------------
<v3>: {<: UnsupportedOperationException} NEW: magic(e: UnsupportedOperationException) -> <v3>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v4>: Int NEW: r(2) -> <v4>
3 <v1>: Int NEW: r(3) -> <v1>
doSmth(3) <v2>: * NEW: call(doSmth, doSmth|<v1>) -> <v2>
{ doSmth(3) } <v2>: * COPY
1 <v0>: Int NEW: r(1) -> <v0>
2 <v4>: Int NEW: r(2) -> <v4>
3 <v1>: Int NEW: r(3) -> <v1>
doSmth(3) <v2>: * NEW: call(doSmth(3), doSmth|<v1>) -> <v2>
{ doSmth(3) } <v2>: * COPY
=====================
== t16 ==
fun t16() : Int {
@@ -362,15 +362,15 @@ fun t16() : Int {
}
---------------------
<v2>: {<: UnsupportedOperationException} NEW: magic(e: UnsupportedOperationException) -> <v2>
1 <v0>: Int NEW: r(1) -> <v0>
doSmth(1) <v1>: * NEW: call(doSmth, doSmth|<v0>) -> <v1>
{ doSmth(1) } <v1>: * COPY
2 <v3>: Int NEW: r(2) -> <v3>
3 <v4>: Int NEW: r(3) -> <v4>
doSmth(3) <v5>: * NEW: call(doSmth, doSmth|<v4>) -> <v5>
{ doSmth(3) } <v5>: * COPY
try { doSmth(1) } catch (e: UnsupportedOperationException) { return 2 } finally { doSmth(3) } <v1>: * COPY
{ try { doSmth(1) } catch (e: UnsupportedOperationException) { return 2 } finally { doSmth(3) } } <v1>: * COPY
1 <v0>: Int NEW: r(1) -> <v0>
doSmth(1) <v1>: * NEW: call(doSmth(1), doSmth|<v0>) -> <v1>
{ doSmth(1) } <v1>: * COPY
2 <v3>: Int NEW: r(2) -> <v3>
3 <v4>: Int NEW: r(3) -> <v4>
doSmth(3) <v5>: * NEW: call(doSmth(3), doSmth|<v4>) -> <v5>
{ doSmth(3) } <v5>: * COPY
try { doSmth(1) } catch (e: UnsupportedOperationException) { return 2 } finally { doSmth(3) } <v1>: * COPY
{ try { doSmth(1) } catch (e: UnsupportedOperationException) { return 2 } finally { doSmth(3) } } <v1>: * COPY
=====================
== doSmth ==
fun doSmth(i: Int) {
compiler/testData/cfg/controlStructures/FinallyTestCopy.instructions
+17 -17
View File
@@ -78,7 +78,7 @@ L0:
jmp?(L3 [onExceptionToFinallyBlock]) NEXT:[mark({ return 1 }), mark({ doSmth() })]
3 mark({ doSmth() })
mark(doSmth())
call(doSmth, doSmth) -> <v0>
call(doSmth(), doSmth) -> <v0>
2 jmp(L4 [afterCatches]) NEXT:[jmp(L6 [skipFinallyToErrorBlock])]
L2 [onException]:
jmp?(L5 [catch 0]) NEXT:[v(e: Exception), v(e: NullPointerException)] PREV:[jmp?(L2 [onException])]
@@ -87,7 +87,7 @@ L2 [onException]:
w(e|<v1>)
4 mark({ doSmth1() })
mark(doSmth1())
call(doSmth1, doSmth1) -> <v2>
call(doSmth1(), doSmth1) -> <v2>
3 jmp(L4 [afterCatches]) NEXT:[jmp(L6 [skipFinallyToErrorBlock])]
L5 [catch 0]:
v(e: Exception) PREV:[jmp?(L5 [catch 0])]
@@ -95,7 +95,7 @@ L5 [catch 0]:
w(e|<v3>)
4 mark({ doSmth2() })
mark(doSmth2())
call(doSmth2, doSmth2) -> <v4>
call(doSmth2(), doSmth2) -> <v4>
3 jmp(L4 [afterCatches])
L4 [afterCatches]:
2 jmp(L6 [skipFinallyToErrorBlock]) NEXT:[mark({ return 1 })] PREV:[jmp(L4 [afterCatches]), jmp(L4 [afterCatches]), jmp(L4 [afterCatches])]
@@ -143,7 +143,7 @@ L0:
L2 [loop entry point]:
L5 [condition entry point]:
mark(cond()) PREV:[mark({ while (cond()) { try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue } } }), jmp(L2 [loop entry point]), jmp(L2 [loop entry point])]
call(cond, cond) -> <v0>
call(cond(), cond) -> <v0>
mark(while (cond()) { try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue } })
jf(L3 [loop exit point]|<v0>) NEXT:[read (Unit), mark({ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue } })]
L4 [body entry point]:
@@ -153,7 +153,7 @@ L4 [body entry point]:
jmp?(L7 [onExceptionToFinallyBlock]) NEXT:[mark({ if (cond()) return else continue }), mark({ doSmth() })]
4 mark({ doSmth() })
mark(doSmth())
call(doSmth, doSmth) -> <v1>
call(doSmth(), doSmth) -> <v1>
3 jmp(L8 [afterCatches]) NEXT:[jmp(L10 [skipFinallyToErrorBlock])]
L6 [onException]:
jmp?(L9 [catch 0]) NEXT:[v(e: Exception), v(e: NullPointerException)] PREV:[jmp?(L6 [onException])]
@@ -162,7 +162,7 @@ L6 [onException]:
w(e|<v2>)
5 mark({ doSmth1() })
mark(doSmth1())
call(doSmth1, doSmth1) -> <v3>
call(doSmth1(), doSmth1) -> <v3>
4 jmp(L8 [afterCatches]) NEXT:[jmp(L10 [skipFinallyToErrorBlock])]
L9 [catch 0]:
v(e: Exception) PREV:[jmp?(L9 [catch 0])]
@@ -170,7 +170,7 @@ L9 [catch 0]:
w(e|<v4>)
5 mark({ doSmth2() })
mark(doSmth2())
call(doSmth2, doSmth2) -> <v5>
call(doSmth2(), doSmth2) -> <v5>
4 jmp(L8 [afterCatches])
L8 [afterCatches]:
3 jmp(L10 [skipFinallyToErrorBlock]) NEXT:[mark({ if (cond()) return else continue })] PREV:[jmp(L8 [afterCatches]), jmp(L8 [afterCatches]), jmp(L8 [afterCatches])]
@@ -179,7 +179,7 @@ L11 [start finally]:
4 mark({ if (cond()) return else continue }) PREV:[jmp?(L7 [onExceptionToFinallyBlock])]
mark(if (cond()) return else continue)
mark(cond())
call(cond, cond) -> <v6>
call(cond(), cond) -> <v6>
jf(L12|<v6>) NEXT:[jmp(L2 [loop entry point]), ret L1]
ret L1 NEXT:[<END>]
- jmp(L13) NEXT:[jmp(error)] PREV:[]
@@ -192,7 +192,7 @@ L10 [skipFinallyToErrorBlock]:
4 mark({ if (cond()) return else continue }) PREV:[jmp(L10 [skipFinallyToErrorBlock])]
mark(if (cond()) return else continue)
mark(cond())
call(cond, cond) -> <v6>
call(cond(), cond) -> <v6>
jf(copy L12|<v6>) NEXT:[jmp(L2 [loop entry point]), ret L1]
ret L1 NEXT:[<END>]
- jmp(copy L13) NEXT:[merge(try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue }|<v1>, <v3>, <v5>) -> <v7>] PREV:[]
@@ -232,7 +232,7 @@ L0:
jmp?(L3 [onExceptionToFinallyBlock]) NEXT:[mark({ while (cond()); }), mark({ doSmth() })]
3 mark({ doSmth() })
mark(doSmth())
call(doSmth, doSmth) -> <v0>
call(doSmth(), doSmth) -> <v0>
2 jmp(L4 [afterCatches]) NEXT:[jmp(L6 [skipFinallyToErrorBlock])]
L2 [onException]:
jmp?(L5 [catch 0]) NEXT:[v(e: Exception), v(e: NullPointerException)] PREV:[jmp?(L2 [onException])]
@@ -241,7 +241,7 @@ L2 [onException]:
w(e|<v1>)
4 mark({ doSmth1() })
mark(doSmth1())
call(doSmth1, doSmth1) -> <v2>
call(doSmth1(), doSmth1) -> <v2>
3 jmp(L4 [afterCatches]) NEXT:[jmp(L6 [skipFinallyToErrorBlock])]
L5 [catch 0]:
v(e: Exception) PREV:[jmp?(L5 [catch 0])]
@@ -249,7 +249,7 @@ L5 [catch 0]:
w(e|<v3>)
4 mark({ doSmth2() })
mark(doSmth2())
call(doSmth2, doSmth2) -> <v4>
call(doSmth2(), doSmth2) -> <v4>
3 jmp(L4 [afterCatches])
L4 [afterCatches]:
2 jmp(L6 [skipFinallyToErrorBlock]) NEXT:[mark({ while (cond()); })] PREV:[jmp(L4 [afterCatches]), jmp(L4 [afterCatches]), jmp(L4 [afterCatches])]
@@ -259,7 +259,7 @@ L7 [start finally]:
L8 [loop entry point]:
L11 [condition entry point]:
mark(cond()) PREV:[mark({ while (cond()); }), jmp(L8 [loop entry point])]
call(cond, cond) -> <v5>
call(cond(), cond) -> <v5>
mark(while (cond()))
jf(L9 [loop exit point]|<v5>) NEXT:[read (Unit), jmp(L8 [loop entry point])]
L10 [body entry point]:
@@ -271,7 +271,7 @@ L12 [finish finally]:
L6 [skipFinallyToErrorBlock]:
3 mark({ while (cond()); }) PREV:[jmp(L6 [skipFinallyToErrorBlock])]
mark(cond()) PREV:[mark({ while (cond()); }), jmp(copy L8 [loop entry point])]
call(cond, cond) -> <v5>
call(cond(), cond) -> <v5>
mark(while (cond()))
jf(copy L9 [loop exit point]|<v5>) NEXT:[read (Unit), jmp(copy L8 [loop entry point])]
jmp(copy L8 [loop entry point]) NEXT:[mark(cond())]
@@ -305,7 +305,7 @@ L0:
jmp?(L2 [onExceptionToFinallyBlock]) NEXT:[mark({ if(list != null) { } }), mark({ doSmth() })]
3 mark({ doSmth() })
mark(doSmth())
call(doSmth, doSmth) -> <v1>
call(doSmth(), doSmth) -> <v1>
2 jmp(L3 [skipFinallyToErrorBlock]) NEXT:[mark({ if(list != null) { } })]
L2 [onExceptionToFinallyBlock]:
L4 [start finally]:
@@ -314,7 +314,7 @@ L4 [start finally]:
r(list) -> <v2>
r(null) -> <v3>
mark(list != null)
call(!=, equals|<v2>, <v3>) -> <v4>
call(list != null, equals|<v2>, <v3>) -> <v4>
jf(L5|<v4>) NEXT:[read (Unit), mark({ })]
4 mark({ })
read (Unit)
@@ -330,7 +330,7 @@ L3 [skipFinallyToErrorBlock]:
r(list) -> <v2>
r(null) -> <v3>
mark(list != null)
call(!=, equals|<v2>, <v3>) -> <v4>
call(list != null, equals|<v2>, <v3>) -> <v4>
jf(copy L5|<v4>) NEXT:[read (Unit), mark({ })]
4 mark({ })
read (Unit)
compiler/testData/cfg/controlStructures/FinallyTestCopy.values
+39 -39
View File
@@ -30,17 +30,17 @@ fun testCopy1() : Int {
}
}
---------------------
<v1>: {<: NullPointerException} NEW: magic(e: NullPointerException) -> <v1>
<v3>: {<: Exception} NEW: magic(e: Exception) -> <v3>
doSmth() <v0>: * NEW: call(doSmth, doSmth) -> <v0>
{ doSmth() } <v0>: * COPY
doSmth1() <v2>: * NEW: call(doSmth1, doSmth1) -> <v2>
{ doSmth1() } <v2>: * COPY
doSmth2() <v4>: * NEW: call(doSmth2, doSmth2) -> <v4>
{ doSmth2() } <v4>: * COPY
1 <v5>: Int NEW: r(1) -> <v5>
<v1>: {<: NullPointerException} NEW: magic(e: NullPointerException) -> <v1>
<v3>: {<: Exception} NEW: magic(e: Exception) -> <v3>
doSmth() <v0>: * NEW: call(doSmth(), doSmth) -> <v0>
{ doSmth() } <v0>: * COPY
doSmth1() <v2>: * NEW: call(doSmth1(), doSmth1) -> <v2>
{ doSmth1() } <v2>: * COPY
doSmth2() <v4>: * NEW: call(doSmth2(), doSmth2) -> <v4>
{ doSmth2() } <v4>: * COPY
1 <v5>: Int NEW: r(1) -> <v5>
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { return 1 } <v6>: * NEW: merge(try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { return 1 }|<v0>, <v2>, <v4>) -> <v6>
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { return 1 } } <v6>: * COPY
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { return 1 } } <v6>: * COPY
=====================
== testCopy2 ==
fun testCopy2() {
@@ -61,18 +61,18 @@ fun testCopy2() {
}
}
---------------------
<v2>: {<: NullPointerException} NEW: magic(e: NullPointerException) -> <v2>
<v4>: {<: Exception} NEW: magic(e: Exception) -> <v4>
cond() <v0>: Boolean NEW: call(cond, cond) -> <v0>
doSmth() <v1>: * NEW: call(doSmth, doSmth) -> <v1>
{ doSmth() } <v1>: * COPY
doSmth1() <v3>: * NEW: call(doSmth1, doSmth1) -> <v3>
{ doSmth1() } <v3>: * COPY
doSmth2() <v5>: * NEW: call(doSmth2, doSmth2) -> <v5>
{ doSmth2() } <v5>: * COPY
cond() <v6>: Boolean NEW: call(cond, cond) -> <v6>
<v2>: {<: NullPointerException} NEW: magic(e: NullPointerException) -> <v2>
<v4>: {<: Exception} NEW: magic(e: Exception) -> <v4>
cond() <v0>: Boolean NEW: call(cond(), cond) -> <v0>
doSmth() <v1>: * NEW: call(doSmth(), doSmth) -> <v1>
{ doSmth() } <v1>: * COPY
doSmth1() <v3>: * NEW: call(doSmth1(), doSmth1) -> <v3>
{ doSmth1() } <v3>: * COPY
doSmth2() <v5>: * NEW: call(doSmth2(), doSmth2) -> <v5>
{ doSmth2() } <v5>: * COPY
cond() <v6>: Boolean NEW: call(cond(), cond) -> <v6>
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue } <v7>: * NEW: merge(try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue }|<v1>, <v3>, <v5>) -> <v7>
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue } } <v7>: * COPY
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue } } <v7>: * COPY
=====================
== testCopy3 ==
fun testCopy3() {
@@ -90,17 +90,17 @@ fun testCopy3() {
}
}
---------------------
<v1>: {<: NullPointerException} NEW: magic(e: NullPointerException) -> <v1>
<v3>: {<: Exception} NEW: magic(e: Exception) -> <v3>
doSmth() <v0>: * NEW: call(doSmth, doSmth) -> <v0>
{ doSmth() } <v0>: * COPY
doSmth1() <v2>: * NEW: call(doSmth1, doSmth1) -> <v2>
{ doSmth1() } <v2>: * COPY
doSmth2() <v4>: * NEW: call(doSmth2, doSmth2) -> <v4>
{ doSmth2() } <v4>: * COPY
cond() <v5>: Boolean NEW: call(cond, cond) -> <v5>
<v1>: {<: NullPointerException} NEW: magic(e: NullPointerException) -> <v1>
<v3>: {<: Exception} NEW: magic(e: Exception) -> <v3>
doSmth() <v0>: * NEW: call(doSmth(), doSmth) -> <v0>
{ doSmth() } <v0>: * COPY
doSmth1() <v2>: * NEW: call(doSmth1(), doSmth1) -> <v2>
{ doSmth1() } <v2>: * COPY
doSmth2() <v4>: * NEW: call(doSmth2(), doSmth2) -> <v4>
{ doSmth2() } <v4>: * COPY
cond() <v5>: Boolean NEW: call(cond(), cond) -> <v5>
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { while (cond()); } <v6>: * NEW: merge(try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { while (cond()); }|<v0>, <v2>, <v4>) -> <v6>
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { while (cond()); } } <v6>: * COPY
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { while (cond()); } } <v6>: * COPY
=====================
== doTestCopy4 ==
fun doTestCopy4(list: List<String>?) : Int {
@@ -113,12 +113,12 @@ fun doTestCopy4(list: List<String>?) : Int {
}
}
---------------------
<v0>: {<: List<String>?} NEW: magic(list: List<String>?) -> <v0>
doSmth() <v1>: * NEW: call(doSmth, doSmth) -> <v1>
{ doSmth() } <v1>: * COPY
list <v2>: {<: Any?} NEW: r(list) -> <v2>
null <v3>: {<: Any?} NEW: r(null) -> <v3>
list != null <v4>: Boolean NEW: call(!=, equals|<v2>, <v3>) -> <v4>
try { doSmth() } finally { if(list != null) { } } <v1>: * COPY
{ try { doSmth() } finally { if(list != null) { } } } <v1>: * COPY
<v0>: {<: List<String>?} NEW: magic(list: List<String>?) -> <v0>
doSmth() <v1>: * NEW: call(doSmth(), doSmth) -> <v1>
{ doSmth() } <v1>: * COPY
list <v2>: {<: Any?} NEW: r(list) -> <v2>
null <v3>: {<: Any?} NEW: r(null) -> <v3>
list != null <v4>: Boolean NEW: call(list != null, equals|<v2>, <v3>) -> <v4>
try { doSmth() } finally { if(list != null) { } } <v1>: * COPY
{ try { doSmth() } finally { if(list != null) { } } } <v1>: * COPY
=====================
compiler/testData/cfg/controlStructures/For.instructions
+2 -2
View File
@@ -11,7 +11,7 @@ L0:
3 r(1) -> <v0>
r(2) -> <v1>
mark(1..2)
call(.., rangeTo|<v0>, <v1>) -> <v2>
call(1..2, rangeTo|<v0>, <v1>) -> <v2>
v(i)
L3:
jmp?(L2) NEXT:[read (Unit), magic(1..2|<v2>) -> <v3>]
@@ -23,7 +23,7 @@ L5 [body entry point]:
4 mark({ doSmth(i) })
r(i) -> <v4>
mark(doSmth(i))
call(doSmth, doSmth|<v4>) -> <v5>
call(doSmth(i), doSmth|<v4>) -> <v5>
3 jmp?(L4 [loop entry point]) NEXT:[magic(1..2|<v2>) -> <v3>, read (Unit)]
L2:
read (Unit) PREV:[jmp?(L2), jmp?(L4 [loop entry point])]
compiler/testData/cfg/controlStructures/For.values
+7 -7
View File
@@ -5,13 +5,13 @@ fun t1() {
}
}
---------------------
<v3>: Int NEW: magic(1..2|<v2>) -> <v3>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
1..2 <v2>: {<: Iterable<Int>} NEW: call(.., rangeTo|<v0>, <v1>) -> <v2>
i <v4>: Int NEW: r(i) -> <v4>
doSmth(i) <v5>: * NEW: call(doSmth, doSmth|<v4>) -> <v5>
{ doSmth(i) } <v5>: * COPY
<v3>: Int NEW: magic(1..2|<v2>) -> <v3>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
1..2 <v2>: {<: Iterable<Int>} NEW: call(1..2, rangeTo|<v0>, <v1>) -> <v2>
i <v4>: Int NEW: r(i) -> <v4>
doSmth(i) <v5>: * NEW: call(doSmth(i), doSmth|<v4>) -> <v5>
{ doSmth(i) } <v5>: * COPY
=====================
== doSmth ==
fun doSmth(i: Int) {}
compiler/testData/cfg/controlStructures/If.instructions
+3 -3
View File
@@ -36,7 +36,7 @@ L2:
L3:
r(u) -> <v3> PREV:[jmp(L3), read (Unit)]
mark(doSmth(u))
call(doSmth, doSmth|<v3>) -> <v4>
call(doSmth(u), doSmth|<v3>) -> <v4>
v(var r: String)
mark(if (b) { r = "s" } else { r = "t" })
r(b) -> <v5>
@@ -54,7 +54,7 @@ L4:
L5:
2 r(r) -> <v8> PREV:[jmp(L5), w(r|<v7>)]
mark(doSmth(r))
call(doSmth, doSmth|<v8>) -> <v9>
call(doSmth(r), doSmth|<v8>) -> <v9>
L1:
1 <END> NEXT:[<SINK>]
error:
@@ -94,7 +94,7 @@ L2:
L3:
r(i) -> <v3>
mark(doSmth(i))
call(doSmth, doSmth|<v3>) -> <v4>
call(doSmth(i), doSmth|<v3>) -> <v4>
mark(if (i is Int) { return; })
mark(i is Int)
r(i) -> <v5>
compiler/testData/cfg/controlStructures/If.values
+18 -18
View File
@@ -16,17 +16,17 @@ fun t1(b: Boolean) {
doSmth(r)
}
---------------------
<v0>: Boolean NEW: magic(b: Boolean) -> <v0>
b <v1>: Boolean NEW: r(b) -> <v1>
"s" <v2>: String NEW: r("s") -> <v2>
u <v3>: String NEW: r(u) -> <v3>
doSmth(u) <v4>: * NEW: call(doSmth, doSmth|<v3>) -> <v4>
b <v5>: Boolean NEW: r(b) -> <v5>
"s" <v6>: String NEW: r("s") -> <v6>
"t" <v7>: String NEW: r("t") -> <v7>
r <v8>: String NEW: r(r) -> <v8>
doSmth(r) <v9>: * NEW: call(doSmth, doSmth|<v8>) -> <v9>
{ var u: String if (b) { u = "s" } doSmth(u) var r: String if (b) { r = "s" } else { r = "t" } doSmth(r) } <v9>: * COPY
<v0>: Boolean NEW: magic(b: Boolean) -> <v0>
b <v1>: Boolean NEW: r(b) -> <v1>
"s" <v2>: String NEW: r("s") -> <v2>
u <v3>: String NEW: r(u) -> <v3>
doSmth(u) <v4>: * NEW: call(doSmth(u), doSmth|<v3>) -> <v4>
b <v5>: Boolean NEW: r(b) -> <v5>
"s" <v6>: String NEW: r("s") -> <v6>
"t" <v7>: String NEW: r("t") -> <v7>
r <v8>: String NEW: r(r) -> <v8>
doSmth(r) <v9>: * NEW: call(doSmth(r), doSmth|<v8>) -> <v9>
{ var u: String if (b) { u = "s" } doSmth(u) var r: String if (b) { r = "s" } else { r = "t" } doSmth(r) } <v9>: * COPY
=====================
== t2 ==
fun t2(b: Boolean) {
@@ -40,13 +40,13 @@ fun t2(b: Boolean) {
}
}
---------------------
<v0>: Boolean NEW: magic(b: Boolean) -> <v0>
3 <v1>: Int NEW: r(3) -> <v1>
b <v2>: Boolean NEW: r(b) -> <v2>
i <v3>: String NEW: r(i) -> <v3>
doSmth(i) <v4>: * NEW: call(doSmth, doSmth|<v3>) -> <v4>
i <v5>: * NEW: r(i) -> <v5>
i is Int <v6>: Boolean NEW: magic(i is Int|<v5>) -> <v6>
<v0>: Boolean NEW: magic(b: Boolean) -> <v0>
3 <v1>: Int NEW: r(3) -> <v1>
b <v2>: Boolean NEW: r(b) -> <v2>
i <v3>: String NEW: r(i) -> <v3>
doSmth(i) <v4>: * NEW: call(doSmth(i), doSmth|<v3>) -> <v4>
i <v5>: * NEW: r(i) -> <v5>
i is Int <v6>: Boolean NEW: magic(i is Int|<v5>) -> <v6>
=====================
== doSmth ==
fun doSmth(s: String) {}
compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.instructions
+18 -18
View File
@@ -10,24 +10,24 @@ L0:
2 mark({ while(0 > 1) { 2 } })
L2 [loop entry point]:
L5 [condition entry point]:
r(0) -> <v0> PREV:[mark({ while(0 > 1) { 2 } }), jmp(L2 [loop entry point])]
r(0) -> <v0> PREV:[mark({ while(0 > 1) { 2 } }), jmp(L2 [loop entry point])]
r(1) -> <v1>
mark(0 > 1)
call(>, compareTo|<v0>, <v1>) -> <v2>
call(0 > 1, compareTo|<v0>, <v1>) -> <v2>
mark(while(0 > 1) { 2 })
jf(L3 [loop exit point]|<v2>) NEXT:[read (Unit), mark({ 2 })]
jf(L3 [loop exit point]|<v2>) NEXT:[read (Unit), mark({ 2 })]
L4 [body entry point]:
3 mark({ 2 })
r(2) -> <v3>
2 jmp(L2 [loop entry point]) NEXT:[r(0) -> <v0>]
2 jmp(L2 [loop entry point]) NEXT:[r(0) -> <v0>]
L3 [loop exit point]:
read (Unit) PREV:[jf(L3 [loop exit point]|<v2>)]
read (Unit) PREV:[jf(L3 [loop exit point]|<v2>)]
L1:
1 <END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
<SINK> PREV:[<ERROR>, <END>]
=====================
== dowhile ==
fun dowhile() {
@@ -42,19 +42,19 @@ L0:
L2 [loop entry point]:
L4 [body entry point]:
mark({return})
ret L1 NEXT:[<END>]
ret L1 NEXT:[<END>]
L5 [condition entry point]:
- r(0) -> <v0> PREV:[]
- r(1) -> <v1> PREV:[]
- mark(0 > 1) PREV:[]
- call(>, compareTo|<v0>, <v1>) -> <v2> PREV:[]
- jt(L2 [loop entry point]|<v2>) NEXT:[read (Unit), mark({return})] PREV:[]
- r(0) -> <v0> PREV:[]
- r(1) -> <v1> PREV:[]
- mark(0 > 1) PREV:[]
- call(0 > 1, compareTo|<v0>, <v1>) -> <v2> PREV:[]
- jt(L2 [loop entry point]|<v2>) NEXT:[read (Unit), mark({return})] PREV:[]
L3 [loop exit point]:
- read (Unit) PREV:[]
- read (Unit) PREV:[]
L1:
1 <END> NEXT:[<SINK>] PREV:[ret L1]
1 <END> NEXT:[<SINK>] PREV:[ret L1]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.values
+8 -8
View File
@@ -5,11 +5,11 @@ fun main() {
}
}
---------------------
0 <v0>: {<: Comparable<Int>} NEW: r(0) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
0 > 1 <v2>: Boolean NEW: call(>, compareTo|<v0>, <v1>) -> <v2>
2 <v3>: * NEW: r(2) -> <v3>
{ 2 } <v3>: * COPY
0 <v0>: {<: Comparable<Int>} NEW: r(0) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
0 > 1 <v2>: Boolean NEW: call(0 > 1, compareTo|<v0>, <v1>) -> <v2>
2 <v3>: * NEW: r(2) -> <v3>
{ 2 } <v3>: * COPY
=====================
== dowhile ==
fun dowhile() {
@@ -17,7 +17,7 @@ fun dowhile() {
while(0 > 1)
}
---------------------
0 <v0>: * NEW: r(0) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
0 > 1 <v2>: * NEW: call(>, compareTo|<v0>, <v1>) -> <v2>
0 <v0>: * NEW: r(0) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
0 > 1 <v2>: * NEW: call(0 > 1, compareTo|<v0>, <v1>) -> <v2>
=====================
compiler/testData/cfg/controlStructures/returnsInWhen.values
+3 -3
View File
@@ -5,8 +5,8 @@ fun illegalWhenBlock(a: Any): Any {
}
}
---------------------
<v0>: {<: Any} NEW: magic(a: Any) -> <v0>
<v0>: {<: Any} NEW: magic(a: Any) -> <v0>
<v2>: * NEW: magic(is Int|<v1>) -> <v2>
a <v1>: * NEW: r(a) -> <v1>
a <v3>: {<: Any} NEW: r(a) -> <v3>
a <v1>: * NEW: r(a) -> <v1>
a <v3>: {<: Any} NEW: r(a) -> <v3>
=====================