From adf8614889e8cf5038a79960aa9651ca7d45e409 Mon Sep 17 00:00:00 2001 From: SvyatoslavScherbina Date: Wed, 21 Feb 2018 10:50:31 +0300 Subject: [PATCH] Fix crash when producing framework with virtual suspend methods (#1344) Note: suspend methods aren't directly available through framework API --- .../backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 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 4fa16a39776..a842c6e43aa 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 @@ -790,8 +790,8 @@ private fun ObjCExportCodeGenerator.createTypeAdapter( } } - val virtualAdapters = descriptor.contributedMethods. - filter { mapper.isBaseMethod(it) && it.isOverridable } + val virtualAdapters = exposedMethods + .filter { mapper.isBaseMethod(it) && it.isOverridable } .map { createMethodVirtualAdapter(it) } val typeInfo = constPointer(codegen.typeInfoValue(descriptor))