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

[FIR] Fix generating of redundant empty else branch in light tree fir generator

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-10-21 10:44:30 +03:00
parent d97e497da0
commit b8bc449bc3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt
+2 -2
View File
@@ -860,8 +860,8 @@ class ExpressionsConverter(
return FirWhenExpressionImpl(null, null, null).apply { return FirWhenExpressionImpl(null, null, null).apply {
val trueBranch = convertLoopBody(thenBlock) val trueBranch = convertLoopBody(thenBlock)
branches += FirWhenBranchImpl(null, firCondition, trueBranch) branches += FirWhenBranchImpl(null, firCondition, trueBranch)
elseBlock?.let { val elseBranch = convertLoopBody(elseBlock)
val elseBranch = convertLoopBody(it) if (elseBranch !is FirEmptyExpressionBlock) {
branches += FirWhenBranchImpl( branches += FirWhenBranchImpl(
null, FirElseIfTrueCondition(null), elseBranch null, FirElseIfTrueCondition(null), elseBranch
) )