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

[FIR] Fix CFG building for secondary constructor with delegation

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-06-02 11:45:48 +03:00
parent b40709649d
commit 72dd2ef448
2 changed files with 45 additions and 44 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
+13 -6
View File
@@ -305,13 +305,20 @@ class ControlFlowGraphBuilder {
// ----------------------------------- Block -----------------------------------
fun enterBlock(block: FirBlock): BlockEnterNode? {
val lastNode = lastNode
return if (lastNode is FunctionEnterNode) {
blocksOfFunctions[block] = lastNode.fir
null
} else {
createBlockEnterNode(block).also { addNewSimpleNode(it) }.also { levelCounter++ }
when (val lastNode = lastNode) {
is FunctionEnterNode -> {
blocksOfFunctions[block] = lastNode.fir
return null
}
is DelegatedConstructorCallNode -> {
val ownerEnterNode = lastNode.owner.enterNode
if (ownerEnterNode is FunctionEnterNode) {
blocksOfFunctions[block] = ownerEnterNode.fir
return null
}
}
}
return createBlockEnterNode(block).also { addNewSimpleNode(it) }.also { levelCounter++ }
}
fun exitBlock(block: FirBlock): CFGNode<*> {