From cc0c3b15926e3adcef32a5258a72350227cd489e Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Tue, 5 Mar 2019 11:01:59 +0100 Subject: [PATCH] Specify default value for irBackend --- .../codegen/signature/KotlinToJvmSignatureMapperImpl.kt | 3 +-- .../org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt | 4 ++-- .../jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt | 3 +-- .../kotlin/android/parcel/ParcelableDeclarationChecker.kt | 3 +-- .../src/IdeaKotlinUastResolveProviderService.kt | 3 +-- .../kotlin/internal/CliKotlinUastResolveProviderService.kt | 3 +-- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt index 5a3e76f0aae..3c68ce964e7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt @@ -19,8 +19,7 @@ class KotlinToJvmSignatureMapperImpl : KotlinToJvmSignatureMapper { private val typeMapper = KotlinTypeMapper( BindingContext.EMPTY, ClassBuilderMode.LIGHT_CLASSES, IncompatibleClassTracker.DoNothing, JvmAbi.DEFAULT_MODULE_NAME, JvmTarget.DEFAULT, - KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT, // TODO use proper LanguageVersionSettings - false + KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT // TODO use proper LanguageVersionSettings ) override fun mapToJvmMethodSignature(function: FunctionDescriptor) = typeMapper.mapAsmMethod(function) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt index e134f26a761..854aef3c218 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt @@ -82,8 +82,8 @@ class KotlinTypeMapper @JvmOverloads constructor( private val moduleName: String, val jvmTarget: JvmTarget, private val languageVersionSettings: LanguageVersionSettings, - private val isIrBackend: Boolean, - private val typePreprocessor: Function1? = null + private val isIrBackend: Boolean = false, + private val typePreprocessor: Function1? = null ) { private val isReleaseCoroutines = languageVersionSettings.supportsFeature(LanguageFeature.ReleaseCoroutines) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt index 6ba724e9f8a..3537f1a8b45 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt @@ -345,8 +345,7 @@ abstract class FileRankingCalculator(private val checkClassFqName: Boolean = tru private fun makeTypeMapper(bindingContext: BindingContext): KotlinTypeMapper { return KotlinTypeMapper( bindingContext, ClassBuilderMode.LIGHT_CLASSES, IncompatibleClassTracker.DoNothing, "debugger", JvmTarget.DEFAULT, - KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT, // TODO use proper LanguageVersionSettings - false + KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT // TODO use proper LanguageVersionSettings ) } diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt index 7be9386f34c..26b9850a6ff 100644 --- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt +++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt @@ -184,8 +184,7 @@ class ParcelableDeclarationChecker : DeclarationChecker { IncompatibleClassTracker.DoNothing, descriptor.module.name.asString(), JvmTarget.DEFAULT, - languageVersionSettings, - false + languageVersionSettings ) for (parameter in primaryConstructor?.valueParameters.orEmpty()) { diff --git a/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt b/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt index 251ff001771..afa9042fc48 100644 --- a/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt +++ b/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt @@ -49,8 +49,7 @@ class IdeaKotlinUastResolveProviderService : KotlinUastResolveProviderService { return KotlinTypeMapper( getBindingContext(element), ClassBuilderMode.LIGHT_CLASSES, IncompatibleClassTracker.DoNothing, JvmAbi.DEFAULT_MODULE_NAME, JvmTarget.DEFAULT, - element.languageVersionSettings, - false + element.languageVersionSettings ) } diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/CliKotlinUastResolveProviderService.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/CliKotlinUastResolveProviderService.kt index bbce95d1b36..a48d7b811c3 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/CliKotlinUastResolveProviderService.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/CliKotlinUastResolveProviderService.kt @@ -62,8 +62,7 @@ class UastAnalysisHandlerExtension : AnalysisHandlerExtension { val typeMapper = KotlinTypeMapper( bindingContext, ClassBuilderMode.LIGHT_CLASSES, IncompatibleClassTracker.DoNothing, JvmAbi.DEFAULT_MODULE_NAME, JvmTarget.DEFAULT, - KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT, // TODO use proper LanguageVersionSettings - false + KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT // TODO use proper LanguageVersionSettings ) this.typeMapper = typeMapper return typeMapper