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

[FIR] Collect logical expression context for smart cast preservation

Browse Source
This commit is contained in:
Yan Zhulanow
2023-06-21 19:56:23 +09:00
parent 92198ee016
commit b43fcae708
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
+6 -1
View File
@@ -544,7 +544,7 @@ open class FirExpressionsResolveTransformer(transformer: FirAbstractBodyResolveT
data data
else else
ResolutionMode.ContextIndependent ResolutionMode.ContextIndependent
transformer.firTowerDataContextCollector?.addStatementContext(block.statements[index], context.towerDataContext) collectStatementContext(block.statements[index])
TransformData.Data(value) TransformData.Data(value)
} }
block.transformOtherChildren(transformer, data) block.transformOtherChildren(transformer, data)
@@ -559,6 +559,10 @@ open class FirExpressionsResolveTransformer(transformer: FirAbstractBodyResolveT
dataFlowAnalyzer.exitBlock(block) dataFlowAnalyzer.exitBlock(block)
} }
private fun collectStatementContext(statement: FirStatement) {
transformer.firTowerDataContextCollector?.addStatementContext(statement, context.towerDataContext)
}
override fun transformThisReceiverExpression( override fun transformThisReceiverExpression(
thisReceiverExpression: FirThisReceiverExpression, thisReceiverExpression: FirThisReceiverExpression,
data: ResolutionMode, data: ResolutionMode,
@@ -982,6 +986,7 @@ open class FirExpressionsResolveTransformer(transformer: FirAbstractBodyResolveT
return binaryLogicExpression.also(dataFlowAnalyzer::enterBinaryLogicExpression) return binaryLogicExpression.also(dataFlowAnalyzer::enterBinaryLogicExpression)
.transformLeftOperand(this, ResolutionMode.WithExpectedType(booleanType)) .transformLeftOperand(this, ResolutionMode.WithExpectedType(booleanType))
.also(dataFlowAnalyzer::exitLeftBinaryLogicExpressionArgument) .also(dataFlowAnalyzer::exitLeftBinaryLogicExpressionArgument)
.also { collectStatementContext(it.rightOperand) }
.transformRightOperand(this, ResolutionMode.WithExpectedType(booleanType)) .transformRightOperand(this, ResolutionMode.WithExpectedType(booleanType))
.also(dataFlowAnalyzer::exitBinaryLogicExpression) .also(dataFlowAnalyzer::exitBinaryLogicExpression)
.transformOtherChildren(transformer, ResolutionMode.WithExpectedType(booleanType)) .transformOtherChildren(transformer, ResolutionMode.WithExpectedType(booleanType))