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

Some minor fixes

Browse Source
This commit is contained in:
Igor Chevdar
2018-06-18 18:40:55 +03:00
parent 7074976f7f
commit 9aae175fc2
2 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/descriptors/ClassVtablesBuilder.kt
+1 -1
View File
@@ -176,7 +176,7 @@ internal class ClassVtablesBuilder(val classDescriptor: ClassDescriptor, val con
classDescriptor.sortedOverridableOrOverridingMethods classDescriptor.sortedOverridableOrOverridingMethods
.flatMap { method -> method.allOverriddenDescriptors.map { OverriddenFunctionDescriptor(method, it) } } .flatMap { method -> method.allOverriddenDescriptors.map { OverriddenFunctionDescriptor(method, it) } }
.filter { it.canBeCalledVirtually } .filter { it.canBeCalledVirtually }
.distinctBy { Triple(it.overriddenDescriptor.uniqueId, it.descriptor, it.needBridge) } .distinctBy { it.overriddenDescriptor.uniqueId }
.sortedBy { it.overriddenDescriptor.uniqueId } .sortedBy { it.overriddenDescriptor.uniqueId }
// TODO: probably method table should contain all accessible methods to improve binary compatibility // TODO: probably method table should contain all accessible methods to improve binary compatibility
} }
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt
+1 -1
View File
@@ -339,7 +339,7 @@ internal object Devirtualization {
DEBUG_OUTPUT(1) { println("Visiting $resolvedFunctionSymbol") } DEBUG_OUTPUT(1) { println("Visiting $resolvedFunctionSymbol") }
val function = (moduleDFG.functions[resolvedFunctionSymbol] ?: externalModulesDFG.functionDFGs[resolvedFunctionSymbol])!! val function = (moduleDFG.functions[resolvedFunctionSymbol] ?: externalModulesDFG.functionDFGs[resolvedFunctionSymbol]) ?: error("Unknown function $resolvedFunctionSymbol")
DEBUG_OUTPUT(1) { function.debugOutput() } DEBUG_OUTPUT(1) { function.debugOutput() }