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

Support deserialized IR in IfNullExpressionsFusionLowering

Browse Source 
Deserializer generates simple branches instead of IrElseBranches.
This commit is contained in:
Dmitry Petrov
2020-05-26 15:40:39 +03:00
parent c9f721848a
commit f81be526bc
1 changed files with 13 additions and 2 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
+13 -2
View File
@@ -172,11 +172,22 @@ class IfNullExpressionsFusionLowering(val context: CommonBackendContext) : FileL
val arg1 = condition0.getValueArgument(1) as? IrConst<*> ?: return null val arg1 = condition0.getValueArgument(1) as? IrConst<*> ?: return null
if (arg1.value != null) return null if (arg1.value != null) return null
val branch1 = whenExpr.branches[1] as? IrElseBranch ?: return null val elseResult = whenExpr.branches[1].getElseBranchResultOrNull() ?: return null
return IfNullExpr(whenExpr.type, subjectVar, branch0.result, branch1.result) return IfNullExpr(whenExpr.type, subjectVar, branch0.result, elseResult)
} }
private fun IrBranch.getElseBranchResultOrNull() =
when {
this is IrElseBranch ->
result
// deserialization generates a simple branch with const 'true' condition
condition is IrConst<*> && condition.value == true ->
result
else ->
null
}
private fun IrExpression.isTrivial() = private fun IrExpression.isTrivial() =
this is IrExpressionWithCopy this is IrExpressionWithCopy