diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt index cb82228fd2c..d421d06612a 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt @@ -713,9 +713,7 @@ internal class FunctionGenerationContext(val function: LLVMValueRef, private val needSlots: Boolean get() { - return slotCount > frameOverlaySlotCount || localAllocs > 0 || - // Prevent empty cleanup on mingw to workaround LLVM bug: - context.config.targetManager.target == KonanTarget.MINGW + return slotCount > frameOverlaySlotCount || localAllocs > 0 } private fun releaseVars() { diff --git a/runtime/src/main/cpp/Exceptions.cpp b/runtime/src/main/cpp/Exceptions.cpp index 5c336f76dee..0ef0ebf00f4 100644 --- a/runtime/src/main/cpp/Exceptions.cpp +++ b/runtime/src/main/cpp/Exceptions.cpp @@ -170,12 +170,6 @@ void ThrowException(KRef exception) { PrintThrowable(exception); RuntimeAssert(false, "Exceptions unsupported"); #else -#if (__MINGW32__ || __MINGW64__) - // Workaround for https://bugs.llvm.org/show_bug.cgi?id=33220 - // This code forces the function to have at least one landingpad: - ObjHolder toBeDestructed(exception); -#endif - throw ObjHolder(exception); #endif }