From 2566aa9db276488050823ba0b054bb83b117d9d4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 23 Feb 2021 11:48:34 +0100 Subject: [PATCH] IR: remove TranslationPluginContext.bindingContext This removes another dependency of 'ir.tree' on 'frontend', and among other things, makes it possible to implement TranslationPluginContext for FIR in the future. --- .../src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt | 5 +---- .../kotlin/backend/konan/serialization/KonanIrlinker.kt | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt index 6e8ac6cecdb..f9c1ed2ec35 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt @@ -7,11 +7,10 @@ import org.jetbrains.kotlin.backend.common.serialization.mangle.ManglerChecker import org.jetbrains.kotlin.backend.common.serialization.mangle.descriptor.Ir2DescriptorManglerAdapter import org.jetbrains.kotlin.backend.konan.descriptors.isForwardDeclarationModule import org.jetbrains.kotlin.backend.konan.descriptors.isFromInteropLibrary -import org.jetbrains.kotlin.backend.konan.ir.konanLibrary import org.jetbrains.kotlin.backend.konan.ir.KonanSymbols import org.jetbrains.kotlin.backend.konan.ir.interop.IrProviderForCEnumAndCStructStubs +import org.jetbrains.kotlin.backend.konan.ir.konanLibrary import org.jetbrains.kotlin.backend.konan.serialization.* -import org.jetbrains.kotlin.backend.konan.serialization.KonanIrLinker import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.config.languageVersionSettings import org.jetbrains.kotlin.descriptors.ModuleDescriptor @@ -79,8 +78,6 @@ internal fun Context.psiToIr( val translationContext = object : TranslationPluginContext { override val moduleDescriptor: ModuleDescriptor get() = generatorContext.moduleDescriptor - override val bindingContext: BindingContext - get() = generatorContext.bindingContext override val symbolTable: ReferenceSymbolTable get() = symbolTable override val typeTranslator: TypeTranslator diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt index 4fe7952bfd6..0b7b532efdc 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt @@ -46,7 +46,6 @@ import org.jetbrains.kotlin.library.KotlinLibrary import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.descriptorUtil.module object KonanFakeOverrideClassFilter : FakeOverrideClassFilter { @@ -227,7 +226,6 @@ internal class KonanIrLinker( } class KonanPluginContext( override val moduleDescriptor: ModuleDescriptor, - override val bindingContext: BindingContext, override val symbolTable: ReferenceSymbolTable, override val typeTranslator: TypeTranslator, override val irBuiltIns: IrBuiltIns @@ -263,4 +261,4 @@ fun IrModuleFragment.toKonanModule() = KonanIrModuleFragmentImpl(descriptor, irB class KonanFileMetadataSource(val module: KonanIrModuleFragmentImpl) : MetadataSource.File { override val name: Name? = null -} \ No newline at end of file +}