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

Fix incorrect coroutines codegen behavior

Browse Source 
If all the suspension calls in a suspend function were "hidden"
under the for-convention (iterator/next/hasNext) calls,
control-flow didn't find them, thus supposing that there is no
suspension points and there is no need to generate a coroutine state machine

The solution is to add relevant calls to CFG

 #KT-15824 Fixed
This commit is contained in:
Denis Zharkov
2017-01-20 15:25:21 +03:00
parent 8cbea903f4
commit 02b40326cc
22 changed files with 609 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg/controlStructures/continueInFor.instructions
Vendored
+17 -11
View File
@@ -16,26 +16,32 @@ L0:
r(10) -> <v2>
mark(1..10)
call(1..10, rangeTo|<v1>, <v2>) -> <v3>
mark(1..10)
call(1..10, iterator|<v3>) -> <v4>
v(i)
L2 [loop entry point]:
L6 [condition entry point]:
jmp?(L3) NEXT:[read (Unit), magic[LOOP_RANGE_ITERATION](1..10|<v3>) -> <v4>] PREV:[v(i), jmp(L6)]
magic[LOOP_RANGE_ITERATION](1..10|<v3>) -> <v4>
w(i|<v4>)
mark(1..10) PREV:[v(i), jmp(L6)]
call(1..10, hasNext) -> <v5>
jmp?(L3) NEXT:[read (Unit), mark(1..10)]
mark(1..10)
call(1..10, next) -> <v6>
magic[LOOP_RANGE_ITERATION](1..10|<v6>) -> <v7>
w(i|<v7>)
mark(for (i in 1..10) { if (b) break; continue; })
L4 [body entry point]:
4 mark({ if (b) break; continue; })
mark(if (b) break)
r(b) -> <v5>
jf(L7|<v5>) NEXT:[read (Unit), jmp(L3)]
r(b) -> <v8>
jf(L7|<v8>) NEXT:[read (Unit), jmp(L3)]
jmp(L3) NEXT:[read (Unit)]
- jmp(L8) NEXT:[merge(if (b) break|!<v6>) -> <v7>] PREV:[]
- jmp(L8) NEXT:[merge(if (b) break|!<v9>) -> <v10>] PREV:[]
L7 [else branch]:
read (Unit) PREV:[jf(L7|<v5>)]
read (Unit) PREV:[jf(L7|<v8>)]
L8 ['if' expression result]:
merge(if (b) break|!<v6>) -> <v7>
jmp(L6) NEXT:[jmp?(L3)]
- 3 jmp(L2) NEXT:[jmp?(L3)] PREV:[]
merge(if (b) break|!<v9>) -> <v10>
jmp(L6) NEXT:[mark(1..10)]
- 3 jmp(L2) NEXT:[mark(1..10)] PREV:[]
L3 [loop exit point]:
L5 [body exit point]:
read (Unit) PREV:[jmp?(L3), jmp(L3)]
@@ -45,4 +51,4 @@ error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
=====================