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

[K/N] Fixed bug in virutal call trampolines

Browse Source 
#KT-60645 Fixed
This commit is contained in:
Igor Chevdar
2023-07-24 14:25:34 +03:00
committed by Space Team
parent e5763a692f
commit 5d6de2f8bf
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt
+1 -2
View File
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.backend.konan.*
import org.jetbrains.kotlin.backend.konan.cgen.CBridgeOrigin import org.jetbrains.kotlin.backend.konan.cgen.CBridgeOrigin
import org.jetbrains.kotlin.backend.konan.descriptors.ClassGlobalHierarchyInfo import org.jetbrains.kotlin.backend.konan.descriptors.ClassGlobalHierarchyInfo
import org.jetbrains.kotlin.backend.konan.ir.* 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.Native
import org.jetbrains.kotlin.backend.konan.llvm.ThreadState.Runnable import org.jetbrains.kotlin.backend.konan.llvm.ThreadState.Runnable
import org.jetbrains.kotlin.backend.konan.llvm.objc.* import org.jetbrains.kotlin.backend.konan.llvm.objc.*
@@ -324,7 +323,7 @@ internal fun CodeGenerator.getVirtualFunctionTrampoline(irFunction: IrSimpleFunc
private fun CodeGenerator.getVirtualFunctionTrampolineImpl(irFunction: IrSimpleFunction) = private fun CodeGenerator.getVirtualFunctionTrampolineImpl(irFunction: IrSimpleFunction) =
generationState.virtualFunctionTrampolines.getOrPut(irFunction) { generationState.virtualFunctionTrampolines.getOrPut(irFunction) {
val targetName = if (irFunction.isExported()) val targetName = if (irFunction.isExported())
irFunction.symbolName irFunction.computeSymbolName()
else else
irFunction.computePrivateSymbolName(irFunction.parentAsClass.fqNameForIrSerialization.asString()) irFunction.computePrivateSymbolName(irFunction.parentAsClass.fqNameForIrSerialization.asString())
val proto = LlvmFunctionProto( val proto = LlvmFunctionProto(