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

[FIR DFA] Rename Persistent.logicStatements -> implications

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2023-10-17 12:49:13 +03:00
committed by Space Team
parent dc08e3bf99
commit 5d3402339e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/Flow.kt
+2 -2
View File
@@ -19,7 +19,7 @@ abstract class Flow {
class PersistentFlow internal constructor( class PersistentFlow internal constructor(
private val previousFlow: PersistentFlow?, private val previousFlow: PersistentFlow?,
private val approvedTypeStatements: PersistentMap<RealVariable, PersistentTypeStatement>, private val approvedTypeStatements: PersistentMap<RealVariable, PersistentTypeStatement>,
internal val logicStatements: PersistentMap<DataFlowVariable, PersistentList<Implication>>, internal val implications: PersistentMap<DataFlowVariable, PersistentList<Implication>>,
// RealVariable describes a storage in memory; a pair of RealVariable with its assignment // 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 // index at a particular execution point forms an SSA value corresponding to the result of
// an initializer. // an initializer.
@@ -60,7 +60,7 @@ class PersistentFlow internal constructor(
fun fork(): MutableFlow = MutableFlow( fun fork(): MutableFlow = MutableFlow(
this, this,
approvedTypeStatements.builder(), approvedTypeStatements.builder(),
logicStatements.builder(), implications.builder(),
assignmentIndex.builder(), assignmentIndex.builder(),
directAliasMap.builder(), directAliasMap.builder(),
backwardsAliasMap.builder(), backwardsAliasMap.builder(),
compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/LogicSystem.kt
+1 -1
View File
@@ -90,7 +90,7 @@ abstract class LogicSystem(private val context: ConeInferenceContext) {
} }
fun approveOperationStatement(flow: PersistentFlow, statement: OperationStatement): TypeStatements { fun approveOperationStatement(flow: PersistentFlow, statement: OperationStatement): TypeStatements {
return approveOperationStatement(flow.logicStatements, statement, removeApprovedOrImpossible = false) return approveOperationStatement(flow.implications.toMutableMap(), statement, removeApprovedOrImpossible = false)
} }
fun approveOperationStatement( fun approveOperationStatement(