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

FIR CFG: handle 'Dead' properly in edge kind merging

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-05-12 19:32:17 +03:00
parent 41f241f608
commit 0c0f4ef3db
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraph.kt
+9 -5
View File
@@ -72,11 +72,15 @@ sealed class CFGNode<out E : FirElement>(val owner: ControlFlowGraph, val level:
} }
private fun merge(first: EdgeKind, second: EdgeKind?): EdgeKind? { private fun merge(first: EdgeKind, second: EdgeKind?): EdgeKind? {
return when (first) { return when (second) {
second -> first null, EdgeKind.Simple, first -> first
EdgeKind.Cfg -> if (second == EdgeKind.Dfg) null else first EdgeKind.Dead -> second
EdgeKind.Dfg -> if (second == EdgeKind.Cfg) null else first // Note: first can be only Cfg, Dfg, or Dead
else -> first else -> when (first) {
EdgeKind.Cfg -> if (second == EdgeKind.Dfg) null else first
EdgeKind.Dfg -> if (second == EdgeKind.Cfg) null else first
else -> first
}
} }
} }