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

[JS IR BE] Workaround empty blocks in state machine builder

Browse Source
This commit is contained in:
Svyatoslav Kuzmich
2018-08-23 19:56:49 +03:00
parent e0237a4480
commit 5192783669
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/StateMachineBuilder.kt
+7 -2
View File
@@ -372,7 +372,9 @@ class StateMachineBuilder(
currentBlock = branchBlock
branch.result.acceptVoid(this)
if (currentBlock.statements.last() !is IrContinue) {
// TODO: block should not be empty
val lastStatement = currentBlock.statements.lastOrNull()
if (lastStatement != null && lastStatement !is IrContinue) {
if (currentState !== rootState) {
doDispatch(exitState)
}
@@ -382,7 +384,10 @@ class StateMachineBuilder(
currentBlock = elseBlock
} else {
branch.result.acceptVoid(this)
if (currentBlock.statements.last() !is IrContinue) {
// TODO: block should not be empty
val lastStatement = currentBlock.statements.lastOrNull()
if (lastStatement != null && lastStatement !is IrContinue) {
if (currentState !== rootState) {
doDispatch(exitState)
}