From 786f5e865795655585097cda6cadd0503328c61a Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 13 Jul 2020 18:26:09 +0200 Subject: [PATCH] Psi2Ir: somewhat simplify Psi2IrTranslator API Inline some methods only used once, deduplicate usages, rearrange parameters, etc. (cherry picked from commit d4bbef222c94c66630446b03c4d79cdfab949263) --- .../jetbrains/kotlin/backend/konan/ToplevelPhases.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt index 7434ccf9600..7a8077b690e 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt @@ -1,8 +1,11 @@ package org.jetbrains.kotlin.backend.konan -import org.jetbrains.kotlin.backend.common.* -import org.jetbrains.kotlin.backend.common.extensions.IrPluginContextImpl +import org.jetbrains.kotlin.backend.common.CheckDeclarationParentsVisitor +import org.jetbrains.kotlin.backend.common.IrValidator +import org.jetbrains.kotlin.backend.common.IrValidatorConfig +import org.jetbrains.kotlin.backend.common.LoggingContext import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension +import org.jetbrains.kotlin.backend.common.extensions.IrPluginContextImpl import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideChecker import org.jetbrains.kotlin.backend.common.phaser.* import org.jetbrains.kotlin.backend.common.serialization.mangle.ManglerChecker @@ -144,9 +147,8 @@ internal val psiToIrPhase = konanUnitPhase( val symbolTable = symbolTable!! - val translator = Psi2IrTranslator(config.configuration.languageVersionSettings, - Psi2IrConfiguration(false), KonanIdSignaturer(KonanManglerDesc)) - val generatorContext = translator.createGeneratorContext(moduleDescriptor, bindingContext, symbolTable = symbolTable) + val translator = Psi2IrTranslator(config.configuration.languageVersionSettings, Psi2IrConfiguration(false)) + val generatorContext = translator.createGeneratorContext(moduleDescriptor, bindingContext, symbolTable) val pluginExtensions = IrGenerationExtension.getInstances(config.project)