From 4811757d8d88c74368bd7fa01b18cf488f53cf16 Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Mon, 16 Jul 2018 20:10:03 +0300 Subject: [PATCH] Disable intercepted instrinsic in 1.3 Fix compiler bootstrapping. --- .../kotlin/backend/common/commonCoroutineCodegenUtil.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/commonCoroutineCodegenUtil.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/commonCoroutineCodegenUtil.kt index 9ee80210814..c34b213f1de 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/commonCoroutineCodegenUtil.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/commonCoroutineCodegenUtil.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.backend.common +import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.config.coroutinesIntrinsicsPackageFqName import org.jetbrains.kotlin.descriptors.FunctionDescriptor @@ -13,7 +14,8 @@ import org.jetbrains.kotlin.name.Name val COROUTINE_SUSPENDED_NAME = Name.identifier("COROUTINE_SUSPENDED") fun FunctionDescriptor.isBuiltInIntercepted(languageVersionSettings: LanguageVersionSettings): Boolean = - isTopLevelInPackage("intercepted", languageVersionSettings.coroutinesIntrinsicsPackageFqName().asString()) + !languageVersionSettings.supportsFeature(LanguageFeature.ReleaseCoroutines) && + isTopLevelInPackage("intercepted", languageVersionSettings.coroutinesIntrinsicsPackageFqName().asString()) fun FunctionDescriptor.isBuiltInSuspendCoroutineUninterceptedOrReturn(languageVersionSettings: LanguageVersionSettings): Boolean = isTopLevelInPackage(