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

[FIR] Enter loops in resolve using independent context

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-09-02 13:20:18 +03:00
parent a7da0d5080
commit 548adc29d0
9 changed files with 645 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/transformers/body/resolve/FirControlFlowStatementsResolveTransformer.kt
+8 -6
View File
@@ -33,23 +33,25 @@ class FirControlFlowStatementsResolveTransformer(transformer: FirBodyResolveTran
// ------------------------------- Loops -------------------------------
override fun transformWhileLoop(whileLoop: FirWhileLoop, data: ResolutionMode): CompositeTransformResult<FirStatement> {
val context = ResolutionMode.ContextIndependent
return whileLoop.also(dataFlowAnalyzer::enterWhileLoop)
.transformCondition(transformer, data).also(dataFlowAnalyzer::exitWhileLoopCondition)
.transformBlock(transformer, data).also(dataFlowAnalyzer::exitWhileLoop)
.transformOtherChildren(transformer, data).compose()
.transformCondition(transformer, context).also(dataFlowAnalyzer::exitWhileLoopCondition)
.transformBlock(transformer, context).also(dataFlowAnalyzer::exitWhileLoop)
.transformOtherChildren(transformer, context).compose()
}
override fun transformDoWhileLoop(doWhileLoop: FirDoWhileLoop, data: ResolutionMode): CompositeTransformResult<FirStatement> {
val context = ResolutionMode.ContextIndependent
// Do-while has a specific scope structure (its block and condition effectively share the scope)
return withNewLocalScope {
doWhileLoop.also(dataFlowAnalyzer::enterDoWhileLoop)
.apply {
transformer.expressionsTransformer.transformBlockInCurrentScope(block, data)
transformer.expressionsTransformer.transformBlockInCurrentScope(block, context)
dataFlowAnalyzer
}
.also(dataFlowAnalyzer::enterDoWhileLoopCondition).transformCondition(transformer, data)
.also(dataFlowAnalyzer::enterDoWhileLoopCondition).transformCondition(transformer, context)
.also(dataFlowAnalyzer::exitDoWhileLoop)
.transformOtherChildren(transformer, data).compose()
.transformOtherChildren(transformer, context).compose()
}
}