diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt index 04e314f7f3b..b714654b65c 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt @@ -36,7 +36,6 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator import org.jetbrains.kotlin.psi2ir.PsiSourceManager -import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.CleanableBindingContext class JvmIrCodegenFactory(private val phaseConfig: PhaseConfig) : CodegenFactory { @@ -75,8 +74,6 @@ class JvmIrCodegenFactory(private val phaseConfig: PhaseConfig) : CodegenFactory val frontEndContext = object : TranslationPluginContext { override val moduleDescriptor: ModuleDescriptor get() = psi2irContext.moduleDescriptor - override val bindingContext: BindingContext - get() = psi2irContext.bindingContext override val symbolTable: ReferenceSymbolTable get() = symbolTable override val typeTranslator: TypeTranslator diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/TranslationPluginContext.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/TranslationPluginContext.kt index 42ff586fbfa..15533f2a284 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/TranslationPluginContext.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/TranslationPluginContext.kt @@ -8,12 +8,9 @@ package org.jetbrains.kotlin.ir.builders import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.ir.util.ReferenceSymbolTable import org.jetbrains.kotlin.ir.util.TypeTranslator -import org.jetbrains.kotlin.resolve.BindingContext interface TranslationPluginContext : IrGeneratorContext { - val moduleDescriptor: ModuleDescriptor - val bindingContext: BindingContext val symbolTable: ReferenceSymbolTable val typeTranslator: TypeTranslator -} \ No newline at end of file +} diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt index 4d7aa007eea..fef050c1046 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt @@ -146,7 +146,7 @@ fun generateKLib( val expectDescriptorToSymbol = mutableMapOf() val feContext = psi2IrContext.run { - JsIrLinker.JsFePluginContext(moduleDescriptor, bindingContext, symbolTable, typeTranslator, irBuiltIns) + JsIrLinker.JsFePluginContext(moduleDescriptor, symbolTable, typeTranslator, irBuiltIns) } val irLinker = JsIrLinker( psi2IrContext.moduleDescriptor, @@ -232,7 +232,7 @@ fun loadIr( val functionFactory = IrFunctionFactory(irBuiltIns, symbolTable) irBuiltIns.functionFactory = functionFactory val feContext = psi2IrContext.run { - JsIrLinker.JsFePluginContext(moduleDescriptor, bindingContext, symbolTable, typeTranslator, irBuiltIns) + JsIrLinker.JsFePluginContext(moduleDescriptor, symbolTable, typeTranslator, irBuiltIns) } val irLinker = JsIrLinker(psi2IrContext.moduleDescriptor, messageLogger, irBuiltIns, symbolTable, functionFactory, feContext, null) val deserializedModuleFragments = sortDependencies(allDependencies.getFullList(), depsDescriptors.descriptors).map { diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt index ef43bab8011..8218088e7e7 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt @@ -20,7 +20,6 @@ import org.jetbrains.kotlin.ir.util.TypeTranslator import org.jetbrains.kotlin.library.IrLibrary import org.jetbrains.kotlin.library.KotlinLibrary import org.jetbrains.kotlin.library.containsErrorCode -import org.jetbrains.kotlin.resolve.BindingContext class JsIrLinker( private val currentModule: ModuleDescriptor?, messageLogger: IrMessageLogger, builtIns: IrBuiltIns, symbolTable: SymbolTable, @@ -60,7 +59,6 @@ class JsIrLinker( class JsFePluginContext( override val moduleDescriptor: ModuleDescriptor, - override val bindingContext: BindingContext, override val symbolTable: ReferenceSymbolTable, override val typeTranslator: TypeTranslator, override val irBuiltIns: IrBuiltIns,