From fbd220fc05ccda3f724a6c34dd5ed994738dab2a Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 11 Sep 2018 12:21:15 +0300 Subject: [PATCH] K/N: Actualize KonanBuiltIns --- .../kotlin/builtins/konan/KonanBuiltIns.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/konan/library-reader/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt b/konan/library-reader/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt index e38fd771d80..fe8ac8a74f6 100644 --- a/konan/library-reader/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt +++ b/konan/library-reader/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt @@ -5,12 +5,21 @@ package org.jetbrains.kotlin.builtins.konan + import org.jetbrains.kotlin.builtins.KotlinBuiltIns +import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.resolve.DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_RELEASE import org.jetbrains.kotlin.storage.StorageManager class KonanBuiltIns(storageManager: StorageManager) : KotlinBuiltIns(storageManager) { override fun getSuspendFunction(parameterCount: Int) = - getBuiltInClassByName(Name.identifier("SuspendFunction$parameterCount")) -} + builtInsModule.findClassAcrossModuleDependencies( + ClassId( + COROUTINES_PACKAGE_FQ_NAME_RELEASE, + Name.identifier("SuspendFunction$parameterCount") + ) + )!! +} \ No newline at end of file