From cb7df4d42887faf5c4362edc38e4bafebc87ed36 Mon Sep 17 00:00:00 2001 From: Alexander Korepanov Date: Fri, 4 Nov 2022 16:04:00 +0100 Subject: [PATCH] [JS IR] IrModuleToJsTransformerTmp.kt -> IrModuleToJsTransformer.kt --- .../cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt | 2 +- .../src/org/jetbrains/kotlin/ir/backend/js/compilerWithIC.kt | 2 +- ...ModuleToJsTransformerTmp.kt => IrModuleToJsTransformer.kt} | 2 +- .../test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt | 4 ++-- .../org/jetbrains/kotlin/js/test/AbstractJsKLibABITestCase.kt | 4 ++-- .../jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) rename compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/{IrModuleToJsTransformerTmp.kt => IrModuleToJsTransformer.kt} (99%) diff --git a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt index d61606e08ef..bb6a9304e29 100644 --- a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt +++ b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt @@ -105,7 +105,7 @@ class K2JsIrCompiler : CLICompiler() { private fun makeJsCodeGeneratorAndDts(): Pair { val ir = lowerIr() - val transformer = IrModuleToJsTransformerTmp(ir.context, mainCallArguments, ir.moduleFragmentToUniqueName) + val transformer = IrModuleToJsTransformer(ir.context, mainCallArguments, ir.moduleFragmentToUniqueName) val mode = TranslationMode.fromFlags(arguments.irDce, arguments.irPerModule, arguments.irMinimizedMemberNames) return transformer.makeJsCodeGeneratorAndDts(ir.allModules, mode) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compilerWithIC.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compilerWithIC.kt index 359259cf249..67e454696bd 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compilerWithIC.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compilerWithIC.kt @@ -67,7 +67,7 @@ class JsIrCompilerWithIC( lowerPreservingTags(allModules, context, PhaseConfig(jsPhases), context.irFactory.stageController as WholeWorldStageController) - val transformer = IrModuleToJsTransformerTmp(context, mainArguments) + val transformer = IrModuleToJsTransformer(context, mainArguments) return transformer.generateBinaryAst(dirtyFiles, allModules) } } diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformerTmp.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt similarity index 99% rename from compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformerTmp.kt rename to compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt index 86e0dc9bf68..66c66ef7feb 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformerTmp.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt @@ -94,7 +94,7 @@ class JsCodeGenerator( } } -class IrModuleToJsTransformerTmp( +class IrModuleToJsTransformer( private val backendContext: JsIrBackendContext, private val mainArguments: List?, private val moduleToName: Map = emptyMap(), diff --git a/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt b/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt index 6719c9da035..ff445459288 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.ir.backend.js.* import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsIrLinker import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsIrModuleSerializer import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsManglerDesc -import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.IrModuleToJsTransformerTmp +import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.IrModuleToJsTransformer import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.TranslationMode import org.jetbrains.kotlin.ir.declarations.IrModuleFragment import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl @@ -609,7 +609,7 @@ class GenerateIrRuntime { jsPhases.invokeToplevel(phaseConfig, context, listOf(module)) - val transformer = IrModuleToJsTransformerTmp(context, null) + val transformer = IrModuleToJsTransformer(context, null) return transformer.generateModule(listOf(module), setOf(TranslationMode.PER_MODULE), false) } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsKLibABITestCase.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsKLibABITestCase.kt index e26169ccb77..0ecf8af7573 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsKLibABITestCase.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsKLibABITestCase.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.ir.backend.js.* import org.jetbrains.kotlin.ir.backend.js.codegen.JsGenerationGranularity import org.jetbrains.kotlin.ir.backend.js.ic.CacheUpdater import org.jetbrains.kotlin.ir.backend.js.ic.JsExecutableProducer -import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.IrModuleToJsTransformerTmp +import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.IrModuleToJsTransformer import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.TranslationMode import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImplForJsIC @@ -206,7 +206,7 @@ abstract class AbstractJsKLibABITestCase : KtUsefulTestCase() { granularity = JsGenerationGranularity.PER_MODULE ) - val transformer = IrModuleToJsTransformerTmp( + val transformer = IrModuleToJsTransformer( backendContext = ir.context, mainArguments = emptyList() ) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt index f043e4b987f..ea21f2dafed 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.ir.backend.js.* import org.jetbrains.kotlin.ir.backend.js.codegen.JsGenerationGranularity import org.jetbrains.kotlin.ir.backend.js.ic.JsExecutableProducer import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsManglerDesc -import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.IrModuleToJsTransformerTmp +import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.IrModuleToJsTransformer import org.jetbrains.kotlin.ir.backend.js.SourceMapsInfo import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.TranslationMode import org.jetbrains.kotlin.ir.declarations.IrModuleFragment @@ -166,7 +166,7 @@ class JsIrBackendFacade( val outputFile = File(JsEnvironmentConfigurator.getJsModuleArtifactPath(testServices, module.name, TranslationMode.FULL) + module.kind.extension) - val transformer = IrModuleToJsTransformerTmp( + val transformer = IrModuleToJsTransformer( loweredIr.context, mainArguments, moduleToName = JsIrModuleToPath(