From 2b47ee03841ac891ac984c6dfc560531c3bf3a23 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Thu, 7 May 2020 12:52:31 +0700 Subject: [PATCH] [ObjCExport] Proper fix for OBJC_OLD_DISPATCH_PROTOTYPES --- .../backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt | 2 +- runtime/src/main/cpp/ObjCExport.mm | 2 -- runtime/src/objc/cpp/ObjCExportClasses.mm | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt index 9c85e5ffded..d739e11ef1e 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt @@ -377,7 +377,7 @@ internal class ObjCExportCodeGenerator( ) } - private val impType = pointerType(functionType(int8TypePtr, true, int8TypePtr, int8TypePtr)) + private val impType = pointerType(functionType(voidType, false)) internal val directMethodAdapters = mutableMapOf() diff --git a/runtime/src/main/cpp/ObjCExport.mm b/runtime/src/main/cpp/ObjCExport.mm index 83dd7d276e6..6775ce2631a 100644 --- a/runtime/src/main/cpp/ObjCExport.mm +++ b/runtime/src/main/cpp/ObjCExport.mm @@ -21,8 +21,6 @@ #if KONAN_OBJC_INTEROP -#define OBJC_OLD_DISPATCH_PROTOTYPES 1 - #import #import #import diff --git a/runtime/src/objc/cpp/ObjCExportClasses.mm b/runtime/src/objc/cpp/ObjCExportClasses.mm index e679895d76f..51c0afede4a 100644 --- a/runtime/src/objc/cpp/ObjCExportClasses.mm +++ b/runtime/src/objc/cpp/ObjCExportClasses.mm @@ -9,8 +9,6 @@ #if KONAN_OBJC_INTEROP -#define OBJC_OLD_DISPATCH_PROTOTYPES 1 - #import #import #import