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

Fix for https://github.com/JetBrains/kotlin-native/issues/3343

Browse Source
This commit is contained in:
Igor Chevdar
2020-02-10 17:24:32 +03:00
parent ba94dcaedb
commit dc5297f3ce
1 changed files with 2 additions and 2 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/Devirtualization.kt
+2 -2
View File
@@ -193,7 +193,7 @@ internal object Devirtualization {
symbolTable.mapClassReferenceType(context.irBuiltIns.anyClass.owner), 1, "Array\$Item") symbolTable.mapClassReferenceType(context.irBuiltIns.anyClass.owner), 1, "Array\$Item")
val functions = mutableMapOf<DataFlowIR.FunctionSymbol, Function>() val functions = mutableMapOf<DataFlowIR.FunctionSymbol, Function>()
val concreteClasses = mutableMapOf<DataFlowIR.Type.Declared, Node>() val concreteClasses = mutableMapOf<DataFlowIR.Type.Declared, Node>()
val externalFunctions = mutableMapOf<DataFlowIR.FunctionSymbol, Node>() val externalFunctions = mutableMapOf<Pair<DataFlowIR.FunctionSymbol, DataFlowIR.Type>, Node>()
val fields = mutableMapOf<DataFlowIR.Field, Node>() // Do not distinguish receivers. val fields = mutableMapOf<DataFlowIR.Field, Node>() // Do not distinguish receivers.
val virtualCallSiteReceivers = mutableMapOf<DataFlowIR.Node.VirtualCall, VirtualCallSiteReceivers>() val virtualCallSiteReceivers = mutableMapOf<DataFlowIR.Node.VirtualCall, VirtualCallSiteReceivers>()
@@ -1019,7 +1019,7 @@ internal object Devirtualization {
val resolvedCallee = callee.resolved() val resolvedCallee = callee.resolved()
val calleeConstraintGraph = createFunctionConstraintGraph(resolvedCallee, false) val calleeConstraintGraph = createFunctionConstraintGraph(resolvedCallee, false)
return if (calleeConstraintGraph == null) { return if (calleeConstraintGraph == null) {
constraintGraph.externalFunctions.getOrPut(resolvedCallee) { constraintGraph.externalFunctions.getOrPut(resolvedCallee to returnType) {
val fictitiousReturnNode = ordinaryNode { "External$resolvedCallee" } val fictitiousReturnNode = ordinaryNode { "External$resolvedCallee" }
if (returnType.isFinal) if (returnType.isFinal)
concreteClass(returnType).addEdge(fictitiousReturnNode) concreteClass(returnType).addEdge(fictitiousReturnNode)