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

[FIR] Drop delayedNode from ControlFlowGraph.orderNodes

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-12-08 13:25:30 +03:00
parent 7b277600a9
commit af4941b222
1 changed files with 1 additions and 3 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
+1 -3
View File
@@ -155,19 +155,17 @@ enum class EdgeKind(
@OptIn(ExperimentalStdlibApi::class) @OptIn(ExperimentalStdlibApi::class)
private fun ControlFlowGraph.orderNodes(): LinkedHashSet<CFGNode<*>> { private fun ControlFlowGraph.orderNodes(): LinkedHashSet<CFGNode<*>> {
val visitedNodes = LinkedHashSet<CFGNode<*>>() val visitedNodes = linkedSetOf<CFGNode<*>>()
/* /*
* [delayedNodes] is needed to accomplish next order contract: * [delayedNodes] is needed to accomplish next order contract:
* for each node all previous node lays before it * for each node all previous node lays before it
*/ */
val delayedNodes = LinkedHashSet<CFGNode<*>>()
val stack = ArrayDeque<CFGNode<*>>() val stack = ArrayDeque<CFGNode<*>>()
stack.addFirst(enterNode) stack.addFirst(enterNode)
while (stack.isNotEmpty()) { while (stack.isNotEmpty()) {
val node = stack.removeFirst() val node = stack.removeFirst()
val previousNodes = node.previousNodes val previousNodes = node.previousNodes
if (previousNodes.any { it !in visitedNodes && it.owner == this && !node.incomingEdges.getValue(it).kind.isBack }) { if (previousNodes.any { it !in visitedNodes && it.owner == this && !node.incomingEdges.getValue(it).kind.isBack }) {
delayedNodes.add(node)
stack.addLast(node) stack.addLast(node)
continue continue
} }