From 9aae175fc2a3673c6ab7e2e8a1a51f296593b66c Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Mon, 18 Jun 2018 18:40:55 +0300 Subject: [PATCH] Some minor fixes --- .../kotlin/backend/konan/descriptors/ClassVtablesBuilder.kt | 2 +- .../kotlin/backend/konan/optimizations/Devirtualization.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/ClassVtablesBuilder.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/ClassVtablesBuilder.kt index 9c710b8221b..2771321f3c9 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/ClassVtablesBuilder.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/ClassVtablesBuilder.kt @@ -176,7 +176,7 @@ internal class ClassVtablesBuilder(val classDescriptor: ClassDescriptor, val con classDescriptor.sortedOverridableOrOverridingMethods .flatMap { method -> method.allOverriddenDescriptors.map { OverriddenFunctionDescriptor(method, it) } } .filter { it.canBeCalledVirtually } - .distinctBy { Triple(it.overriddenDescriptor.uniqueId, it.descriptor, it.needBridge) } + .distinctBy { it.overriddenDescriptor.uniqueId } .sortedBy { it.overriddenDescriptor.uniqueId } // TODO: probably method table should contain all accessible methods to improve binary compatibility } diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt index 497eb705078..61e00f7e9f9 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt @@ -339,7 +339,7 @@ internal object Devirtualization { 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() }