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

FIR: Minor. Extract helpers

Browse Source
This commit is contained in:
Denis.Zharkov
2021-10-19 18:10:06 +03:00
committed by TeamCityServer
parent fba44759c0
commit 5317cf3af1
1 changed files with 9 additions and 6 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
+9 -6
View File
@@ -1106,13 +1106,10 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
variableStorage.getOrCreateRealVariable(flow, initializer.symbol, initializer)
?.let { initializerVariable ->
val isInitializerStable = initializerVariable.stability == PropertyStability.STABLE_VALUE ||
(initializerVariable.stability == PropertyStability.LOCAL_VAR &&
initializer is FirQualifiedAccessExpression &&
!isAccessToUnstableLocalVariable(initializer))
val isInitializerStable =
initializerVariable.isStable || (initializerVariable.hasLocalStability && initializer.isAccessToStableVariable())
if (isInitializerStable && (propertyVariable.stability == PropertyStability.STABLE_VALUE || propertyVariable.stability == PropertyStability.LOCAL_VAR)
) {
if (isInitializerStable && (propertyVariable.hasLocalStability || propertyVariable.isStable)) {
logicSystem.addLocalVariableAlias(
flow, propertyVariable,
RealVariableAndType(initializerVariable, initializer.coneType)
@@ -1141,6 +1138,12 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
}
}
private fun FirExpression.isAccessToStableVariable(): Boolean =
this is FirQualifiedAccessExpression && !isAccessToUnstableLocalVariable(this)
private val RealVariable.isStable get() = stability == PropertyStability.STABLE_VALUE
private val RealVariable.hasLocalStability get() = stability == PropertyStability.LOCAL_VAR
fun exitThrowExceptionNode(throwExpression: FirThrowExpression) {
graphBuilder.exitThrowExceptionNode(throwExpression).mergeIncomingFlow()