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

[FIR] Fast check of changed in CfgTraverser

Browse Source
This commit is contained in:
Ivan Kochurkin
2022-05-19 16:14:15 +03:00
committed by Space Team
parent 03afc1f2d8
commit 6aca5e3037
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/util/CfgTraverser.kt
+9 -8
View File
@@ -43,10 +43,10 @@ fun <I> ControlFlowGraph.collectDataForNode(
val startNode = getEnterNode(direction) val startNode = getEnterNode(direction)
nodeMap[startNode] = initialInfo nodeMap[startNode] = initialInfo
val changed = mutableMapOf<CFGNode<*>, Boolean>() var shouldContinue: Boolean
do { do {
collectDataForNodeInternal(direction, initialInfo, visitor, nodeMap, changed, visitSubGraphs) shouldContinue = collectDataForNodeInternal(direction, initialInfo, visitor, nodeMap, visitSubGraphs)
} while (changed.any { it.value }) } while (shouldContinue)
return nodeMap return nodeMap
} }
@@ -56,13 +56,13 @@ private fun <I> ControlFlowGraph.collectDataForNodeInternal(
initialInfo: I, initialInfo: I,
visitor: ControlFlowGraphVisitor<I, Collection<Pair<EdgeLabel, I>>>, visitor: ControlFlowGraphVisitor<I, Collection<Pair<EdgeLabel, I>>>,
nodeMap: MutableMap<CFGNode<*>, I>, nodeMap: MutableMap<CFGNode<*>, I>,
changed: MutableMap<CFGNode<*>, Boolean>,
visitSubGraphs: Boolean = true visitSubGraphs: Boolean = true
) { ): Boolean {
var changed = false
val nodes = getNodesInOrder(direction) val nodes = getNodesInOrder(direction)
for (node in nodes) { for (node in nodes) {
if (visitSubGraphs && direction == TraverseDirection.Backward && node is CFGNodeWithSubgraphs<*>) { if (visitSubGraphs && direction == TraverseDirection.Backward && node is CFGNodeWithSubgraphs<*>) {
node.subGraphs.forEach { it.collectDataForNodeInternal(direction, initialInfo, visitor, nodeMap, changed) } node.subGraphs.forEach { changed = changed or it.collectDataForNodeInternal(direction, initialInfo, visitor, nodeMap) }
} }
val previousNodes = when (direction) { val previousNodes = when (direction) {
TraverseDirection.Forward -> node.previousCfgNodes TraverseDirection.Forward -> node.previousCfgNodes
@@ -81,12 +81,13 @@ private fun <I> ControlFlowGraph.collectDataForNodeInternal(
val data = nodeMap[node] val data = nodeMap[node]
val newData = node.accept(visitor, previousData) val newData = node.accept(visitor, previousData)
val hasChanged = newData != data val hasChanged = newData != data
changed[node] = hasChanged changed = changed or hasChanged
if (hasChanged) { if (hasChanged) {
nodeMap[node] = newData nodeMap[node] = newData
} }
if (visitSubGraphs && direction == TraverseDirection.Forward && node is CFGNodeWithSubgraphs<*>) { if (visitSubGraphs && direction == TraverseDirection.Forward && node is CFGNodeWithSubgraphs<*>) {
node.subGraphs.forEach { it.collectDataForNodeInternal(direction, initialInfo, visitor, nodeMap, changed) } node.subGraphs.forEach { changed = changed or it.collectDataForNodeInternal(direction, initialInfo, visitor, nodeMap) }
} }
} }
return changed
} }