From 443269af0a70ec0dc5ef956a08a1987c5c964c34 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Fri, 28 Aug 2020 16:15:08 +0300 Subject: [PATCH] [IR] Drop `irProviders` from stub generator --- .../org/jetbrains/kotlin/backend/jvm/JvmBackendFacade.kt | 2 -- .../jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt | 6 ------ .../kotlin/ir/util/ExternalDependenciesGenerator.kt | 4 +--- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendFacade.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendFacade.kt index 8d8544fa5d9..2d45895a014 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendFacade.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendFacade.kt @@ -101,8 +101,6 @@ object JvmBackendFacade { } val irProviders = listOf(irLinker) - stubGenerator.setIrProviders(irProviders) - val irModuleFragment = psi2ir.generateModuleFragment(psi2irContext, files, irProviders, pluginExtensions, expectDescriptorToSymbol = null) irLinker.postProcess() diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt index 3966021d176..300442145ba 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt @@ -53,12 +53,6 @@ class DeclarationStubGenerator( lazyTable.stubGenerator = if (value) this else null } - private lateinit var irProviders_: List - - fun setIrProviders(value: List) { - irProviders_ = value - } - val typeTranslator = TypeTranslator( lazyTable, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/ExternalDependenciesGenerator.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/ExternalDependenciesGenerator.kt index 70ae974d986..1501ab6c8a1 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/ExternalDependenciesGenerator.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/ExternalDependenciesGenerator.kt @@ -77,7 +77,5 @@ fun generateTypicalIrProviderList( val stubGenerator = DeclarationStubGenerator( moduleDescriptor, symbolTable, irBuiltins.languageVersionSettings, extensions ) - return listOfNotNull(deserializer, stubGenerator).also { - stubGenerator.setIrProviders(it) - } + return listOfNotNull(deserializer, stubGenerator) } \ No newline at end of file