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

Fix compiler bootstrap (1.4.0-dev-9205)

Browse Source
This commit is contained in:
Dmitry Petrov
2020-05-27 00:26:32 +03:00
parent 5c58a9dfd1
commit 69fa067df9
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/IfNullExpressionsFusionLowering.kt
+4 -7
View File
@@ -177,14 +177,11 @@ class IfNullExpressionsFusionLowering(val context: CommonBackendContext) : FileL
return IfNullExpr(whenExpr.type, subjectVar, branch0.result, elseResult) return IfNullExpr(whenExpr.type, subjectVar, branch0.result, elseResult)
} }
private fun IrBranch.getElseBranchResultOrNull() = private fun IrBranch.getElseBranchResultOrNull(): IrExpression? {
when { val branchCondition = condition
this is IrElseBranch -> return if (branchCondition is IrConst<*> && branchCondition.value == true)
result result
// deserialization generates a simple branch with const 'true' condition else
condition is IrConst<*> && condition.value == true ->
result
else ->
null null
} }