From 5d6de2f8bf789805c15aa74ebe655c2c5ecbfe1b Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Mon, 24 Jul 2023 14:25:34 +0300 Subject: [PATCH] [K/N] Fixed bug in virutal call trampolines #KT-60645 Fixed --- .../org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt index c5b07192c62..4249e795ce8 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.backend.konan.* import org.jetbrains.kotlin.backend.konan.cgen.CBridgeOrigin import org.jetbrains.kotlin.backend.konan.descriptors.ClassGlobalHierarchyInfo import org.jetbrains.kotlin.backend.konan.ir.* -import org.jetbrains.kotlin.backend.konan.llvm.KonanBinaryInterface.symbolName import org.jetbrains.kotlin.backend.konan.llvm.ThreadState.Native import org.jetbrains.kotlin.backend.konan.llvm.ThreadState.Runnable import org.jetbrains.kotlin.backend.konan.llvm.objc.* @@ -324,7 +323,7 @@ internal fun CodeGenerator.getVirtualFunctionTrampoline(irFunction: IrSimpleFunc private fun CodeGenerator.getVirtualFunctionTrampolineImpl(irFunction: IrSimpleFunction) = generationState.virtualFunctionTrampolines.getOrPut(irFunction) { val targetName = if (irFunction.isExported()) - irFunction.symbolName + irFunction.computeSymbolName() else irFunction.computePrivateSymbolName(irFunction.parentAsClass.fqNameForIrSerialization.asString()) val proto = LlvmFunctionProto(