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

[FIR] Rearrange arguments in VariableStorageImpl functions to make them consistent

Browse Source
This commit is contained in:
Ivan Kochurkin
2021-12-13 14:40:10 +03:00
committed by teamcity
parent e3219cc5b6
commit 1f9ea50d1a
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
+4 -4
View File
@@ -114,7 +114,7 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
override fun updateAllReceivers(flow: PersistentFlow) { override fun updateAllReceivers(flow: PersistentFlow) {
receiverStack.forEach { receiverStack.forEach {
variableStorage.getRealVariable(it.boundSymbol, it.receiverExpression, flow)?.let { variable -> variableStorage.getRealVariable(flow, it.boundSymbol, it.receiverExpression)?.let { variable ->
processUpdatedReceiverVariable(flow, variable) processUpdatedReceiverVariable(flow, variable)
} }
} }
@@ -172,7 +172,7 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
} }
} }
else -> null else -> null
} ?: return false } ?: return false
return context.firLocalVariableAssignmentAnalyzer?.isAccessToUnstableLocalVariable(qualifiedAccessExpression) == true return context.firLocalVariableAssignmentAnalyzer?.isAccessToUnstableLocalVariable(qualifiedAccessExpression) == true
} }
@@ -195,7 +195,7 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
expression: FirExpression expression: FirExpression
): Pair<PropertyStability, MutableList<ConeKotlinType>>? { ): Pair<PropertyStability, MutableList<ConeKotlinType>>? {
val flow = graphBuilder.lastNode.flow val flow = graphBuilder.lastNode.flow
var variable = variableStorage.getRealVariableWithoutUnwrappingAlias(symbol, expression, flow) ?: return null var variable = variableStorage.getRealVariableWithoutUnwrappingAlias(flow, symbol, expression) ?: return null
val stability = variable.stability val stability = variable.stability
val result = mutableListOf<ConeKotlinType>() val result = mutableListOf<ConeKotlinType>()
flow.directAliasMap[variable]?.let { flow.directAliasMap[variable]?.let {
@@ -836,7 +836,7 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
val (loopConditionExitNode, loopBlockEnterNode) = graphBuilder.exitWhileLoopCondition(loop) val (loopConditionExitNode, loopBlockEnterNode) = graphBuilder.exitWhileLoopCondition(loop)
loopConditionExitNode.mergeIncomingFlow() loopConditionExitNode.mergeIncomingFlow()
val conditionExitFlow = loopConditionExitNode.flow val conditionExitFlow = loopConditionExitNode.flow
loopBlockEnterNode.flow = variableStorage.getVariable(loop.condition, conditionExitFlow)?.let { conditionVariable -> loopBlockEnterNode.flow = variableStorage.getVariable(conditionExitFlow, loop.condition)?.let { conditionVariable ->
logicSystem.approveStatementsInsideFlow( logicSystem.approveStatementsInsideFlow(
conditionExitFlow, conditionExitFlow,
conditionVariable eq true, conditionVariable eq true,
compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/VariableStorage.kt
+3 -3
View File
@@ -9,8 +9,8 @@ import org.jetbrains.kotlin.fir.FirElement
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
abstract class VariableStorage { abstract class VariableStorage {
abstract fun getRealVariableWithoutUnwrappingAlias(symbol: FirBasedSymbol<*>?, fir: FirElement, flow: Flow): RealVariable? abstract fun getRealVariableWithoutUnwrappingAlias(flow: Flow, symbol: FirBasedSymbol<*>?, fir: FirElement): RealVariable?
abstract fun getRealVariable(symbol: FirBasedSymbol<*>?, fir: FirElement, flow: Flow): RealVariable? abstract fun getRealVariable(flow: Flow, symbol: FirBasedSymbol<*>?, fir: FirElement): RealVariable?
abstract fun getSyntheticVariable(fir: FirElement): SyntheticVariable? abstract fun getSyntheticVariable(fir: FirElement): SyntheticVariable?
abstract fun getVariable(fir: FirElement, flow: Flow): DataFlowVariable? abstract fun getVariable(flow: Flow, fir: FirElement): DataFlowVariable?
} }
compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/VariableStorageImpl.kt
+5 -5
View File
@@ -127,27 +127,27 @@ class VariableStorageImpl(private val session: FirSession) : VariableStorage() {
} }
} }
override fun getRealVariableWithoutUnwrappingAlias(symbol: FirBasedSymbol<*>?, fir: FirElement, flow: Flow): RealVariable? { override fun getRealVariableWithoutUnwrappingAlias(flow: Flow, symbol: FirBasedSymbol<*>?, fir: FirElement): RealVariable? {
val realFir = fir.unwrapElement() val realFir = fir.unwrapElement()
return symbol.takeIf { it.getStability(realFir) != null }?.let { return symbol.takeIf { it.getStability(realFir) != null }?.let {
_realVariables[getIdentifierBySymbol(flow, it, realFir.unwrapElement())] _realVariables[getIdentifierBySymbol(flow, it, realFir.unwrapElement())]
} }
} }
override fun getRealVariable(symbol: FirBasedSymbol<*>?, fir: FirElement, flow: Flow): RealVariable? { override fun getRealVariable(flow: Flow, symbol: FirBasedSymbol<*>?, fir: FirElement): RealVariable? {
return getRealVariableWithoutUnwrappingAlias(symbol, fir, flow)?.let { flow.unwrapVariable(it) } return getRealVariableWithoutUnwrappingAlias(flow, symbol, fir)?.let { flow.unwrapVariable(it) }
} }
override fun getSyntheticVariable(fir: FirElement): SyntheticVariable? { override fun getSyntheticVariable(fir: FirElement): SyntheticVariable? {
return syntheticVariables[fir.unwrapElement()] return syntheticVariables[fir.unwrapElement()]
} }
override fun getVariable(fir: FirElement, flow: Flow): DataFlowVariable? { override fun getVariable(flow: Flow, fir: FirElement): DataFlowVariable? {
val realFir = fir.unwrapElement() val realFir = fir.unwrapElement()
val symbol = realFir.symbol val symbol = realFir.symbol
val stability = symbol.getStability(fir) val stability = symbol.getStability(fir)
return if (stability != null) { return if (stability != null) {
getRealVariable(symbol, realFir, flow) getRealVariable(flow, symbol, realFir)
} else { } else {
getSyntheticVariable(fir) getSyntheticVariable(fir)
} }