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

[K/N] Don't add safe point and state switching after setCurrentFrame in cleanup landingpad

Browse Source
This commit is contained in:
Elena Lepilkina
2021-10-14 11:54:47 +03:00
committed by Space
parent 28e30f7a45
commit ccddf5b2d5
1 changed files with 4 additions and 3 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
+4 -3
View File
@@ -894,7 +894,7 @@ internal abstract class FunctionGenerationContext(
fun extractValue(aggregate: LLVMValueRef, index: Int, name: String = ""): LLVMValueRef = fun extractValue(aggregate: LLVMValueRef, index: Int, name: String = ""): LLVMValueRef =
LLVMBuildExtractValue(builder, aggregate, index, name)!! LLVMBuildExtractValue(builder, aggregate, index, name)!!
fun gxxLandingpad(numClauses: Int, name: String = "", switchThreadState: Boolean = false): LLVMValueRef { fun gxxLandingpad(numClauses: Int, name: String = "", switchThreadState: Boolean = false, callFromCleanupBlock: Boolean = false): LLVMValueRef {
val personalityFunction = context.llvm.gxxPersonalityFunction.llvmValue val personalityFunction = context.llvm.gxxPersonalityFunction.llvmValue
// Type of `landingpad` instruction result (depends on personality function): // Type of `landingpad` instruction result (depends on personality function):
@@ -907,7 +907,8 @@ internal abstract class FunctionGenerationContext(
} }
call(context.llvm.setCurrentFrameFunction, listOf(slotsPhi!!)) call(context.llvm.setCurrentFrameFunction, listOf(slotsPhi!!))
setCurrentFrameIsCalled = true setCurrentFrameIsCalled = true
handleEpilogueForExperimentalMM(context.llvm.Kotlin_mm_safePointExceptionUnwind) if (!callFromCleanupBlock)
handleEpilogueForExperimentalMM(context.llvm.Kotlin_mm_safePointExceptionUnwind)
return landingpad return landingpad
} }
@@ -1489,7 +1490,7 @@ internal abstract class FunctionGenerationContext(
if (shouldHaveCleanupLandingpad) { if (shouldHaveCleanupLandingpad) {
appendingTo(cleanupLandingpad) { appendingTo(cleanupLandingpad) {
val landingpad = gxxLandingpad(numClauses = 0) val landingpad = gxxLandingpad(numClauses = 0, callFromCleanupBlock = true)
LLVMSetCleanup(landingpad, 1) LLVMSetCleanup(landingpad, 1)
forwardingForeignExceptionsTerminatedWith?.let { terminator -> forwardingForeignExceptionsTerminatedWith?.let { terminator ->