From 300c3c30fbd113892abe5e92be50bf4eb754d7d7 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 10 Apr 2020 15:14:27 +0300 Subject: [PATCH] [FIR] Fix erasing existing data flow statements --- .../jetbrains/kotlin/fir/resolve/dfa/PersistentLogicSystem.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/PersistentLogicSystem.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/PersistentLogicSystem.kt index d5640c3eef9..ba579649ae7 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/PersistentLogicSystem.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/PersistentLogicSystem.kt @@ -317,7 +317,7 @@ abstract class PersistentLogicSystem(context: ConeInferenceContext) : LogicSyste if (shouldRemoveOriginalStatements) { logicStatements -= originalVariable } - logicStatements = logicStatements.put(newVariable, newStatements) + logicStatements = logicStatements.put(newVariable, logicStatements[newVariable]?.let { it + newStatements } ?: newStatements) } }