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

[FIR] Choose right cfg owner for postponed lambdas

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-03-31 11:56:38 +03:00
parent 9fa0a2cc77
commit 68b5e4d13f
1 changed files with 3 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/dfa/cfg/ControlFlowGraphBuilder.kt
+3 -1
View File
@@ -54,6 +54,7 @@ class ControlFlowGraphBuilder {
private val entersToPostponedAnonymousFunctions: MutableMap<FirFunctionSymbol<*>, PostponedLambdaEnterNode> = mutableMapOf() private val entersToPostponedAnonymousFunctions: MutableMap<FirFunctionSymbol<*>, PostponedLambdaEnterNode> = mutableMapOf()
private val exitsFromPostponedAnonymousFunctions: MutableMap<FirFunctionSymbol<*>, PostponedLambdaExitNode> = mutableMapOf() private val exitsFromPostponedAnonymousFunctions: MutableMap<FirFunctionSymbol<*>, PostponedLambdaExitNode> = mutableMapOf()
private val parentGraphForAnonymousFunctions: MutableMap<FirFunctionSymbol<*>, ControlFlowGraph> = mutableMapOf()
private val exitsFromCompletedPostponedAnonymousFunctions: MutableList<PostponedLambdaExitNode> = mutableListOf() private val exitsFromCompletedPostponedAnonymousFunctions: MutableList<PostponedLambdaExitNode> = mutableListOf()
@@ -178,7 +179,7 @@ class ControlFlowGraphBuilder {
null null
} }
if (graph != null) { if (graph != null) {
val previousGraph = graphs.top() val previousGraph = parentGraphForAnonymousFunctions.remove(function.symbol) ?: graphs.top()
if (previousGraph.kind == ControlFlowGraph.Kind.Function) { if (previousGraph.kind == ControlFlowGraph.Kind.Function) {
previousGraph.addSubGraph(graph) previousGraph.addSubGraph(graph)
} }
@@ -213,6 +214,7 @@ class ControlFlowGraphBuilder {
val symbol = anonymousFunction.symbol val symbol = anonymousFunction.symbol
entersToPostponedAnonymousFunctions[symbol] = enterNode entersToPostponedAnonymousFunctions[symbol] = enterNode
exitsFromPostponedAnonymousFunctions[symbol] = exitNode exitsFromPostponedAnonymousFunctions[symbol] = exitNode
parentGraphForAnonymousFunctions[symbol] = graph
CFGNode.addEdge(lastNodes.pop(), enterNode, kind = EdgeKind.Simple, propagateDeadness = true) CFGNode.addEdge(lastNodes.pop(), enterNode, kind = EdgeKind.Simple, propagateDeadness = true)
CFGNode.addEdge(enterNode, exitNode, kind = EdgeKind.Dfg, propagateDeadness = true) CFGNode.addEdge(enterNode, exitNode, kind = EdgeKind.Dfg, propagateDeadness = true)
lastNodes.push(exitNode) lastNodes.push(exitNode)