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

CFA: additional jumps to catch / finally generated in the end of try / before exits from try #KT-5469 Fixed

Browse Source 
Also #KT-13612 Fixed
(cherry picked from commit 7c188b3)
This commit is contained in:
Mikhail Glukhikh
2016-04-20 17:34:19 +03:00
committed by Mikhail Glukhikh
parent 43954699a7
commit f8039249c6
28 changed files with 638 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg/tailCalls/finally.instructions
Vendored
+3 -2
View File
@@ -14,10 +14,11 @@ L0:
jmp?(L2) NEXT:[mark({ test() }), mark({ // do nothing })]
3 mark({ // do nothing })
read (Unit)
2 jmp(L3) NEXT:[mark({ test() })]
2 jmp?(L2) NEXT:[mark({ test() }), jmp(L3)]
jmp(L3) NEXT:[mark({ test() })]
L2 [onExceptionToFinallyBlock]:
L4 [start finally]:
3 mark({ test() }) PREV:[jmp?(L2)]
3 mark({ test() }) PREV:[jmp?(L2), jmp?(L2)]
mark(test())
call(test(), test) -> <v0>
L5 [finish finally]:
compiler/testData/cfg/tailCalls/finallyWithReturn.instructions
Vendored
+3 -2
View File
@@ -14,10 +14,11 @@ L0:
jmp?(L2) NEXT:[mark({ return test() }), mark({ // do nothing })]
3 mark({ // do nothing })
read (Unit)
2 jmp(L3) NEXT:[mark({ return test() })]
2 jmp?(L2) NEXT:[mark({ return test() }), jmp(L3)]
jmp(L3) NEXT:[mark({ return test() })]
L2 [onExceptionToFinallyBlock]:
L4 [start finally]:
3 mark({ return test() }) PREV:[jmp?(L2)]
3 mark({ return test() }) PREV:[jmp?(L2), jmp?(L2)]
mark(test())
call(test(), test) -> <v0>
ret(*|<v0>) L1 NEXT:[<END>]
compiler/testData/cfg/tailCalls/try.instructions
Vendored
+5 -3
View File
@@ -13,12 +13,14 @@ L0:
mark(try { return foo() } catch (e: Throwable) { })
jmp?(L2) NEXT:[v(e: Throwable), mark({ return foo() })]
3 mark({ return foo() })
jmp?(L2) NEXT:[v(e: Throwable), mark(foo())]
mark(foo())
call(foo(), foo) -> <v0>
ret(*|<v0>) L1 NEXT:[<END>]
- 2 jmp(L3) NEXT:[merge(try { return foo() } catch (e: Throwable) { }|!<v1>, !<v3>) -> <v4>] PREV:[]
- 2 jmp?(L2) NEXT:[v(e: Throwable), jmp(L3)] PREV:[]
- jmp(L3) NEXT:[merge(try { return foo() } catch (e: Throwable) { }|!<v1>, !<v3>) -> <v4>] PREV:[]
L2 [onException]:
3 v(e: Throwable) PREV:[jmp?(L2)]
3 v(e: Throwable) PREV:[jmp?(L2), jmp?(L2)]
magic[FAKE_INITIALIZER](e: Throwable) -> <v2>
w(e|<v2>)
4 mark({ })
@@ -32,4 +34,4 @@ error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
=====================
compiler/testData/cfg/tailCalls/tryCatchFinally.instructions
Vendored
+5 -3
View File
@@ -18,9 +18,11 @@ L0:
3 mark({ test() })
mark(test())
call(test(), test) -> <v0>
2 jmp(L4) NEXT:[jmp(L5)]
2 jmp?(L2) NEXT:[v(any : Exception), jmp?(L3)]
jmp?(L3) NEXT:[mark({ test() }), jmp(L4)]
jmp(L4) NEXT:[jmp(L5)]
L2 [onException]:
3 v(any : Exception) PREV:[jmp?(L2)]
3 v(any : Exception) PREV:[jmp?(L2), jmp?(L2)]
magic[FAKE_INITIALIZER](any : Exception) -> <v1>
w(any|<v1>)
4 mark({ test() })
@@ -31,7 +33,7 @@ L4 [afterCatches]:
2 jmp(L5) NEXT:[mark({ test() })] PREV:[jmp(L4), jmp(L4)]
L3 [onExceptionToFinallyBlock]:
L6 [start finally]:
3 mark({ test() }) PREV:[jmp?(L3)]
3 mark({ test() }) PREV:[jmp?(L3), jmp?(L3)]
mark(test())
call(test(), test) -> <v3>
L7 [finish finally]: