From 5d3402339e862b7d53c3591c3434c2f488a2f656 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 17 Oct 2023 12:49:13 +0300 Subject: [PATCH] [FIR DFA] Rename Persistent.logicStatements -> implications --- .../src/org/jetbrains/kotlin/fir/resolve/dfa/Flow.kt | 4 ++-- .../src/org/jetbrains/kotlin/fir/resolve/dfa/LogicSystem.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/Flow.kt b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/Flow.kt index 73ffda6d72a..8c09be09a11 100644 --- a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/Flow.kt +++ b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/Flow.kt @@ -19,7 +19,7 @@ abstract class Flow { class PersistentFlow internal constructor( private val previousFlow: PersistentFlow?, private val approvedTypeStatements: PersistentMap, - internal val logicStatements: PersistentMap>, + internal val implications: PersistentMap>, // RealVariable describes a storage in memory; a pair of RealVariable with its assignment // index at a particular execution point forms an SSA value corresponding to the result of // an initializer. @@ -60,7 +60,7 @@ class PersistentFlow internal constructor( fun fork(): MutableFlow = MutableFlow( this, approvedTypeStatements.builder(), - logicStatements.builder(), + implications.builder(), assignmentIndex.builder(), directAliasMap.builder(), backwardsAliasMap.builder(), diff --git a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/LogicSystem.kt b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/LogicSystem.kt index d31b36843aa..46ba41d0025 100644 --- a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/LogicSystem.kt +++ b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/LogicSystem.kt @@ -90,7 +90,7 @@ abstract class LogicSystem(private val context: ConeInferenceContext) { } fun approveOperationStatement(flow: PersistentFlow, statement: OperationStatement): TypeStatements { - return approveOperationStatement(flow.logicStatements, statement, removeApprovedOrImpossible = false) + return approveOperationStatement(flow.implications.toMutableMap(), statement, removeApprovedOrImpossible = false) } fun approveOperationStatement(