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

[K/N] Fix ObjC bridges LeaveFrame generation (return values in bridges are produced before epilogue block)

Browse Source
This commit is contained in:
Elena Lepilkina
2021-10-12 15:07:24 +03:00
committed by Space
parent dba645bce1
commit c228bfb18f
1 changed files with 5 additions and 4 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
+5 -4
View File
@@ -475,7 +475,10 @@ internal abstract class FunctionGenerationContext(
private val entryBb = basicBlockInFunction("entry", startLocation) private val entryBb = basicBlockInFunction("entry", startLocation)
protected val cleanupLandingpad = basicBlockInFunction("cleanup_landingpad", endLocation) protected val cleanupLandingpad = basicBlockInFunction("cleanup_landingpad", endLocation)
private var needLeaveFrameInUnwindEpilogue: Boolean = false private val needLeaveFrameInUnwindEpilogue: Boolean
get() = irFunction?.annotations?.hasAnnotation(RuntimeNames.exportForCppRuntime) == true
|| forwardingForeignExceptionsTerminatedWith != null
|| irFunction?.origin == CBridgeOrigin.C_TO_KOTLIN_BRIDGE
private var setCurrentFrameIsCalled: Boolean = false private var setCurrentFrameIsCalled: Boolean = false
val stackLocalsManager = StackLocalsManagerImpl(this, stackLocalsInitBb) val stackLocalsManager = StackLocalsManagerImpl(this, stackLocalsInitBb)
@@ -1419,9 +1422,7 @@ internal abstract class FunctionGenerationContext(
} }
internal fun epilogue() { internal fun epilogue() {
needLeaveFrameInUnwindEpilogue = irFunction?.annotations?.hasAnnotation(RuntimeNames.exportForCppRuntime) == true val needLeaveFrameInUnwindEpilogue = this.needLeaveFrameInUnwindEpilogue
|| forwardingForeignExceptionsTerminatedWith != null
|| irFunction?.origin == CBridgeOrigin.C_TO_KOTLIN_BRIDGE
appendingTo(prologueBb) { appendingTo(prologueBb) {
val slots = if (needSlotsPhi || needLeaveFrameInUnwindEpilogue) val slots = if (needSlotsPhi || needLeaveFrameInUnwindEpilogue)