Fix compiler bootstrap (1.4.0-dev-9205)

This commit is contained in:
Dmitry Petrov
2020-05-27 00:26:32 +03:00
parent 5c58a9dfd1
commit 69fa067df9
@@ -177,16 +177,13 @@ 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 -> null
result }
else ->
null
}
private fun IrExpression.isTrivial() = private fun IrExpression.isTrivial() =
this is IrExpressionWithCopy this is IrExpressionWithCopy