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

Supported IrGetObjectValue in CallGraphBuilder

Browse Source
This commit is contained in:
Igor Chevdar
2019-03-25 17:01:16 +03:00
parent dcf82951ed
commit 7bf16abf66
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/CallGraphBuilder.kt
+14 -4
View File
@@ -88,14 +88,24 @@ internal class CallGraphBuilder(val context: Context,
reversedEdges.put(symbol, list) reversedEdges.put(symbol, list)
} }
private inline fun DataFlowIR.FunctionBody.forEachCallSite(block: (DataFlowIR.Node.Call) -> Unit) =
nodes.forEach { node ->
when (node) {
is DataFlowIR.Node.Call -> block(node)
is DataFlowIR.Node.Singleton ->
node.constructor?.let { block(DataFlowIR.Node.Call(it, emptyList(), null)) }
}
}
private fun dfs(symbol: DataFlowIR.FunctionSymbol) { private fun dfs(symbol: DataFlowIR.FunctionSymbol) {
visitedFunctions += symbol visitedFunctions += symbol
if (gotoExternal) { if (gotoExternal) {
addNode(symbol) addNode(symbol)
val function = moduleDFG.functions[symbol] ?: externalModulesDFG.functionDFGs[symbol] val function = moduleDFG.functions[symbol] ?: externalModulesDFG.functionDFGs[symbol]
val body = function!!.body val body = function!!.body
body.nodes.filterIsInstance<DataFlowIR.Node.Call>() body
.forEach { call -> .forEachCallSite { call ->
val devirtualizedCallSite = (call as? DataFlowIR.Node.VirtualCall)?.let { devirtualizedCallSites?.get(it) } val devirtualizedCallSite = (call as? DataFlowIR.Node.VirtualCall)?.let { devirtualizedCallSites?.get(it) }
if (devirtualizedCallSite == null) { if (devirtualizedCallSite == null) {
val callee = call.callee.resolved() val callee = call.callee.resolved()
@@ -124,8 +134,8 @@ internal class CallGraphBuilder(val context: Context,
local = false local = false
} }
val body = function.body val body = function.body
body.nodes.filterIsInstance<DataFlowIR.Node.Call>() body
.forEach { call -> .forEachCallSite { call ->
val devirtualizedCallSite = (call as? DataFlowIR.Node.VirtualCall)?.let { devirtualizedCallSites?.get(it) } val devirtualizedCallSite = (call as? DataFlowIR.Node.VirtualCall)?.let { devirtualizedCallSites?.get(it) }
if (devirtualizedCallSite == null) { if (devirtualizedCallSite == null) {
val callee = call.callee.resolved() val callee = call.callee.resolved()