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

[K/N][codegen] Escape analysis: handled nulls more optimally

Browse Source 
Helps with https://youtrack.jetbrains.com/issue/KT-44148
This commit is contained in:
Igor Chevdar
2021-05-19 14:52:32 +05:00
parent 426ac1281d
commit 29584edcdd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/EscapeAnalysis.kt
+3 -2
View File
@@ -182,13 +182,14 @@ internal object EscapeAnalysis {
fun computeDepths(node: DataFlowIR.Node, depth: Int) { fun computeDepths(node: DataFlowIR.Node, depth: Int) {
if (node is DataFlowIR.Node.Scope) if (node is DataFlowIR.Node.Scope)
node.nodes.forEach { computeDepths(it, depth + 1) } node.nodes.forEach { computeDepths(it, depth + 1) }
else else if (node != DataFlowIR.Node.Null)
nodesRoles[node] = NodeInfo(depth) nodesRoles[node] = NodeInfo(depth)
} }
computeDepths(body.rootScope, Depths.ROOT_SCOPE - 1) computeDepths(body.rootScope, Depths.ROOT_SCOPE - 1)
fun assignRole(node: DataFlowIR.Node, role: Role, infoEntry: RoleInfoEntry?) { fun assignRole(node: DataFlowIR.Node, role: Role, infoEntry: RoleInfoEntry?) {
nodesRoles[node]!!.add(role, infoEntry) if (node != DataFlowIR.Node.Null && infoEntry?.node != DataFlowIR.Node.Null)
nodesRoles[node]!!.add(role, infoEntry)
} }
body.returns.values.forEach { assignRole(it.node, Role.RETURN_VALUE, null) } body.returns.values.forEach { assignRole(it.node, Role.RETURN_VALUE, null) }