From 82d55e1a67eaaecb5890603c81c57c84687f7eb6 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Mon, 20 Apr 2020 20:42:26 +0300 Subject: [PATCH] Minor: remove unused parameters, reformat code --- .../org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt | 2 +- .../org/jetbrains/kotlin/backend/jvm/JvmBackendFacade.kt | 7 +++++-- .../src/org/jetbrains/kotlin/psi2ir/Psi2IrTranslator.kt | 4 +++- .../jetbrains/kotlin/psi2ir/generators/GeneratorContext.kt | 5 ++--- .../src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt | 5 +---- .../src/org/jetbrains/kotlin/ir/backend/js/klib.kt | 5 ++--- .../kotlin/scripting/repl/js/JsScriptDependencyCompiler.kt | 3 +-- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt index 265cb15cb14..9527b30257d 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt @@ -169,7 +169,7 @@ class Fir2IrConverter( val typeTranslator = TypeTranslator(symbolTable, languageVersionSettings, moduleDescriptor.builtIns) constantValueGenerator.typeTranslator = typeTranslator typeTranslator.constantValueGenerator = constantValueGenerator - val builtIns = IrBuiltIns(moduleDescriptor.builtIns, typeTranslator, signaturer, symbolTable) + val builtIns = IrBuiltIns(moduleDescriptor.builtIns, typeTranslator, symbolTable) val sourceManager = PsiSourceManager() val components = Fir2IrComponentsStorage(session, scopeSession, symbolTable, builtIns) val declarationStorage = Fir2IrDeclarationStorage(components, moduleDescriptor) 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 e4220f02cfe..d06ad9ae678 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 @@ -56,7 +56,9 @@ object JvmBackendFacade { val stubGenerator = DeclarationStubGenerator( psi2irContext.moduleDescriptor, psi2irContext.symbolTable, psi2irContext.irBuiltIns.languageVersionSettings, extensions ) - val irLinker = JvmIrLinker(psi2irContext.moduleDescriptor, EmptyLoggingContext, psi2irContext.irBuiltIns, psi2irContext.symbolTable, stubGenerator, mangler) + val irLinker = JvmIrLinker( + psi2irContext.moduleDescriptor, EmptyLoggingContext, psi2irContext.irBuiltIns, psi2irContext.symbolTable, stubGenerator, mangler + ) val dependencies = psi2irContext.moduleDescriptor.allDependencyModules.map { val kotlinLibrary = (it.getCapability(KlibModuleOrigin.CAPABILITY) as? DeserializedKlibModuleOrigin)?.library irLinker.deserializeIrModuleHeader(it, kotlinLibrary) @@ -65,7 +67,8 @@ object JvmBackendFacade { stubGenerator.setIrProviders(irProviders) - val irModuleFragment = psi2ir.generateModuleFragment(psi2irContext, files, irProviders, expectDescriptorToSymbol = null, pluginExtensions) + val irModuleFragment = + psi2ir.generateModuleFragment(psi2irContext, files, irProviders, expectDescriptorToSymbol = null, pluginExtensions) irLinker.postProcess() stubGenerator.unboundSymbolGeneration = true diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/Psi2IrTranslator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/Psi2IrTranslator.kt index e9fdae4d636..9ef875cba87 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/Psi2IrTranslator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/Psi2IrTranslator.kt @@ -63,7 +63,9 @@ class Psi2IrTranslator( symbolTable: SymbolTable = SymbolTable(signaturer), extensions: GeneratorExtensions = GeneratorExtensions() ): GeneratorContext = - createGeneratorContext(configuration, moduleDescriptor, bindingContext, languageVersionSettings, symbolTable, extensions, signaturer) + createGeneratorContext( + configuration, moduleDescriptor, bindingContext, languageVersionSettings, symbolTable, extensions + ) fun generateModuleFragment( context: GeneratorContext, diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/GeneratorContext.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/GeneratorContext.kt index e8eebdb0fe5..1d5d1ae2b83 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/GeneratorContext.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/GeneratorContext.kt @@ -28,8 +28,7 @@ fun createGeneratorContext( bindingContext: BindingContext, languageVersionSettings: LanguageVersionSettings, symbolTable: SymbolTable, - extensions: GeneratorExtensions, - signaturer: IdSignatureComposer + extensions: GeneratorExtensions ): GeneratorContext { val typeTranslator = TypeTranslator(symbolTable, languageVersionSettings, builtIns = moduleDescriptor.builtIns) val constantValueGenerator = ConstantValueGenerator(moduleDescriptor, symbolTable) @@ -44,7 +43,7 @@ fun createGeneratorContext( extensions, typeTranslator, constantValueGenerator, - IrBuiltIns(moduleDescriptor.builtIns, typeTranslator, signaturer, symbolTable) + IrBuiltIns(moduleDescriptor.builtIns, typeTranslator, symbolTable) ) } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt index 26080f8aa02..0a7cf6e58c8 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt @@ -36,15 +36,12 @@ import org.jetbrains.kotlin.types.* class IrBuiltIns( val builtIns: KotlinBuiltIns, private val typeTranslator: TypeTranslator, - signaturer: IdSignatureComposer, - outerSymbolTable: SymbolTable? = null + private val symbolTable: SymbolTable ) { val languageVersionSettings = typeTranslator.languageVersionSettings private val builtInsModule = builtIns.builtInsModule - private val symbolTable = outerSymbolTable ?: SymbolTable(signaturer) - private val packageFragmentDescriptor = IrBuiltinsPackageFragmentDescriptorImpl(builtInsModule, KOTLIN_INTERNAL_IR_FQN) val packageFragment = IrExternalPackageFragmentImpl(symbolTable.referenceExternalPackageFragment(packageFragmentDescriptor), KOTLIN_INTERNAL_IR_FQN) 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 d813934b5be..6c1442b5872 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 @@ -229,7 +229,7 @@ fun loadIr( ) typeTranslator.constantValueGenerator = constantValueGenerator constantValueGenerator.typeTranslator = typeTranslator - val irBuiltIns = IrBuiltIns(moduleDescriptor.builtIns, typeTranslator, signaturer, symbolTable) + val irBuiltIns = IrBuiltIns(moduleDescriptor.builtIns, typeTranslator, symbolTable) val irLinker = JsIrLinker(null, emptyLoggingContext, irBuiltIns, symbolTable, null) val deserializedModuleFragments = sortDependencies(allDependencies.getFullList(), depsDescriptors.descriptors).map { @@ -264,8 +264,7 @@ private fun runAnalysisAndPreparePsi2Ir(depsDescriptors: ModulesStructure): Gene analysisResult.bindingContext, depsDescriptors.compilerConfiguration.languageVersionSettings, SymbolTable(signaturer), - GeneratorExtensions(), - signaturer + GeneratorExtensions() ) } diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/repl/js/JsScriptDependencyCompiler.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/repl/js/JsScriptDependencyCompiler.kt index 9f76ba1ffd2..9f9e35bd53b 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/repl/js/JsScriptDependencyCompiler.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/repl/js/JsScriptDependencyCompiler.kt @@ -48,8 +48,7 @@ class JsScriptDependencyCompiler( it.constantValueGenerator = ConstantValueGenerator(moduleDescriptor, symbolTable) } - val signaturer = IdSignatureDescriptor(JsManglerDesc) - val irBuiltIns = IrBuiltIns(builtIns, typeTranslator, signaturer, symbolTable) + val irBuiltIns = IrBuiltIns(builtIns, typeTranslator, symbolTable) val jsLinker = JsIrLinker(null, emptyLoggingContext, irBuiltIns, symbolTable, null) val moduleFragment = IrModuleFragmentImpl(moduleDescriptor, irBuiltIns)