From e1443210831e2d117e7a950e703ea6583422b254 Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Mon, 17 Dec 2018 16:29:19 +0300 Subject: [PATCH] Allowed inlining of suspend lambdas --- .../kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt index 7a0afc0b6ad..2eafae30019 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.backend.konan.serialization.isExported import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor import org.jetbrains.kotlin.builtins.getFunctionalClassKind import org.jetbrains.kotlin.builtins.isFunctionType +import org.jetbrains.kotlin.builtins.isSuspendFunctionType import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.kotlin.builtins.konan.KonanBuiltIns @@ -78,7 +79,7 @@ internal val FunctionDescriptor.isFunctionInvoke: Boolean val dispatchReceiver = dispatchReceiverParameter ?: return false assert(!dispatchReceiver.type.isKFunctionType) - return dispatchReceiver.type.isFunctionType && + return (dispatchReceiver.type.isFunctionType || dispatchReceiver.type.isSuspendFunctionType) && this.isOperator && this.name == OperatorNameConventions.INVOKE }