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

[FIR] Add Stub kind for CFG

Browse Source 
Edges of stub graphs shouldn't be completed
This commit is contained in:
Dmitriy Novozhilov
2020-06-16 10:59:10 +03:00
parent 1a0df97961
commit 4e6542a646
2 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/ControlFlowGraph.kt
+2
View File
@@ -35,6 +35,7 @@ class ControlFlowGraph(val declaration: FirDeclaration?, val name: String, val k
internal fun complete() { internal fun complete() {
assertState(State.Building) assertState(State.Building)
state = State.Completed state = State.Completed
if (kind == Kind.Stub) return
val sortedNodes = orderNodes() val sortedNodes = orderNodes()
assert(sortedNodes.size == _nodes.size) assert(sortedNodes.size == _nodes.size)
for (node in _nodes) { for (node in _nodes) {
@@ -80,6 +81,7 @@ class ControlFlowGraph(val declaration: FirDeclaration?, val name: String, val k
TopLevel(withBody = false), TopLevel(withBody = false),
AnnotationCall(withBody = true), AnnotationCall(withBody = true),
DefaultArgument(withBody = false), DefaultArgument(withBody = false),
Stub(withBody = true)
} }
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt
+1 -1
View File
@@ -318,7 +318,7 @@ class ControlFlowGraphBuilder {
fun enterClass() { fun enterClass() {
pushGraph( pushGraph(
ControlFlowGraph(null, "STUB_CLASS_GRAPH", ControlFlowGraph.Kind.ClassInitializer), ControlFlowGraph(null, "STUB_CLASS_GRAPH", ControlFlowGraph.Kind.Stub),
mode = Mode.ClassInitializer mode = Mode.ClassInitializer
) )
} }