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

chore: prevent the creation of unused code blocks in IR.

Browse Source
This commit is contained in:
Artem Kobzar
2022-03-21 11:26:13 +00:00
committed by Space
parent 77c04e7d71
commit 6aa8c3aa2a
1 changed files with 18 additions and 5 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/BlockDecomposerLowering.kt
+18 -5
View File
@@ -412,17 +412,30 @@ class BlockDecomposerTransformer(
val block = IrBlockImpl(expression.startOffset, expression.endOffset, unitType, expression.origin) val block = IrBlockImpl(expression.startOffset, expression.endOffset, unitType, expression.origin)
// TODO: consider decomposing only when it is really required // TODO: consider decomposing only when it is really required
results.fold(block) { appendBlock, (cond, res, orig) -> results.foldIndexed(block) { i, appendBlock, (cond, res, orig) ->
val condStatements = destructureComposite(cond) val condStatements = destructureComposite(cond)
val condValue = condStatements.last() as IrExpression val condValue = condStatements.last() as IrExpression
appendBlock.statements += condStatements.run { subList(0, lastIndex) } appendBlock.statements += condStatements.run { subList(0, lastIndex) }
JsIrBuilder.buildBlock(unitType).also { JsIrBuilder.buildBlock(unitType).also {
val elseBlock = if (isElseBranch(orig)) null else it val elseBlock = it.takeIf { results.lastIndex != i }
val ifElseNode = val additionalStatements = when {
JsIrBuilder.buildIfElse(orig.startOffset, orig.endOffset, unitType, condValue, res, elseBlock, expression.origin) isElseBranch(orig) -> (res as? IrBlock)?.statements ?: listOf(res)
appendBlock.statements += ifElseNode else -> listOf(
JsIrBuilder.buildIfElse(
orig.startOffset,
orig.endOffset,
unitType,
condValue,
res,
elseBlock,
expression.origin
)
)
}
appendBlock.statements += additionalStatements
} }
} }