diff --git a/compiler/testData/ir/irText/classes/cloneable.kt b/compiler/testData/ir/irText/classes/cloneable.kt index cbb738c02dc..48948edb01f 100644 --- a/compiler/testData/ir/irText/classes/cloneable.kt +++ b/compiler/testData/ir/irText/classes/cloneable.kt @@ -1,9 +1,6 @@ // FIR_IDENTICAL // SKIP_KLIB_TEST -// IGNORE_BACKEND_K1: JS_IR -// IGNORE_BACKEND_K1: JS_IR_ES6 -// IGNORE_BACKEND_K2: JS_IR -// IGNORE_BACKEND_K2: JS_IR_ES6 +// IGNORE_BACKEND: JS_IR, JS_IR_ES6 // STATUS: This should not work in JS, Cloneable is JVM-specific API class A : Cloneable diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJvmResultsConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJvmResultsConverter.kt new file mode 100644 index 00000000000..8789cd8a747 --- /dev/null +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJvmResultsConverter.kt @@ -0,0 +1,142 @@ +/* + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.test.frontend.fir + +import org.jetbrains.kotlin.backend.jvm.JvmIrCodegenFactory +import org.jetbrains.kotlin.backend.jvm.JvmIrDeserializerImpl +import org.jetbrains.kotlin.backend.jvm.serialization.JvmIdSignatureDescriptor +import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys +import org.jetbrains.kotlin.cli.jvm.compiler.NoScopeRecordCliBindingTrace +import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM +import org.jetbrains.kotlin.codegen.ClassBuilderFactories +import org.jetbrains.kotlin.codegen.state.GenerationState +import org.jetbrains.kotlin.container.get +import org.jetbrains.kotlin.fir.FirAnalyzerFacade +import org.jetbrains.kotlin.fir.backend.Fir2IrCommonMemberStorage +import org.jetbrains.kotlin.fir.backend.Fir2IrComponents +import org.jetbrains.kotlin.fir.backend.IrBuiltInsOverFir +import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendClassResolver +import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendExtension +import org.jetbrains.kotlin.fir.backend.jvm.FirJvmKotlinMangler +import org.jetbrains.kotlin.fir.backend.jvm.JvmFir2IrExtensions +import org.jetbrains.kotlin.fir.psi +import org.jetbrains.kotlin.ir.backend.jvm.serialization.JvmDescriptorMangler +import org.jetbrains.kotlin.ir.backend.jvm.serialization.JvmIrMangler +import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.resolve.CompilerEnvironment +import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory +import org.jetbrains.kotlin.test.backend.ir.IrBackendInput +import org.jetbrains.kotlin.test.directives.CodegenTestDirectives +import org.jetbrains.kotlin.test.model.BackendKinds +import org.jetbrains.kotlin.test.model.Frontend2BackendConverter +import org.jetbrains.kotlin.test.model.FrontendKinds +import org.jetbrains.kotlin.test.model.TestModule +import org.jetbrains.kotlin.test.services.TestServices +import org.jetbrains.kotlin.test.services.compilerConfigurationProvider + +class Fir2IrJvmResultsConverter( + testServices: TestServices +) : Frontend2BackendConverter( + testServices, + FrontendKinds.FIR, + BackendKinds.IrBackend +) { + override fun transform( + module: TestModule, + inputArtifact: FirOutputArtifact + ): IrBackendInput? { + return try { + transformInternal(module, inputArtifact) + } catch (e: Throwable) { + if (CodegenTestDirectives.IGNORE_FIR2IR_EXCEPTIONS_IF_FIR_CONTAINS_ERRORS in module.directives && inputArtifact.hasErrors) { + null + } else { + throw e + } + } + } + + private fun transformInternal( + module: TestModule, + inputArtifact: FirOutputArtifact + ): IrBackendInput.JvmIrBackendInput { + val compilerConfigurationProvider = testServices.compilerConfigurationProvider + val configuration = compilerConfigurationProvider.getCompilerConfiguration(module) + + val fir2IrExtensions = JvmFir2IrExtensions(configuration, JvmIrDeserializerImpl(), JvmIrMangler) + + // Create and initialize the module and its dependencies + val project = compilerConfigurationProvider.getProject(module) + // TODO: handle fir from light tree + val ktFiles = inputArtifact.mainFirFiles.mapNotNull { it.value.psi as KtFile? } + val sourceFiles = inputArtifact.mainFirFiles.mapNotNull { it.value.sourceFile } + val container = TopDownAnalyzerFacadeForJVM.createContainer( + project, ktFiles, NoScopeRecordCliBindingTrace(), configuration, + compilerConfigurationProvider.getPackagePartProviderFactory(module), + ::FileBasedDeclarationProviderFactory, CompilerEnvironment, + TopDownAnalyzerFacadeForJVM.newModuleSearchScope(project, ktFiles), emptyList() + ) + + val phaseConfig = configuration.get(CLIConfigurationKeys.PHASE_CONFIG) + + val dependentIrParts = mutableListOf() + lateinit var mainIrPart: JvmIrCodegenFactory.JvmIrBackendInput + lateinit var mainModuleComponents: Fir2IrComponents + + val firAnalyzerFacade = inputArtifact.partsForDependsOnModules.last().firAnalyzerFacade as? FirAnalyzerFacade + val generateSignatures = firAnalyzerFacade?.fir2IrConfiguration?.linkViaSignatures == true + + val commonMemberStorage = Fir2IrCommonMemberStorage( + generateSignatures = generateSignatures, + signatureComposerCreator = { JvmIdSignatureDescriptor(JvmDescriptorMangler(null)) }, + manglerCreator = { FirJvmKotlinMangler() } + ) + var irBuiltIns: IrBuiltInsOverFir? = null + + for ((index, firOutputPart) in inputArtifact.partsForDependsOnModules.withIndex()) { + val (irModuleFragment, components, pluginContext) = firOutputPart.firAnalyzerFacade.convertToIr( + fir2IrExtensions, commonMemberStorage, irBuiltIns + ) + irBuiltIns = components.irBuiltIns + + val irPart = JvmIrCodegenFactory.JvmIrBackendInput( + irModuleFragment, + components.symbolTable, + phaseConfig, + components.irProviders, + fir2IrExtensions, + FirJvmBackendExtension(components, irActualizedResult = null), + pluginContext, + notifyCodegenStart = {}, + ) + + if (index < inputArtifact.partsForDependsOnModules.size - 1) { + dependentIrParts.add(irPart) + } else { + mainModuleComponents = components + mainIrPart = irPart + } + } + + val codegenFactory = JvmIrCodegenFactory(configuration, phaseConfig) + val generationState = GenerationState.Builder( + project, ClassBuilderFactories.TEST, + container.get(), NoScopeRecordCliBindingTrace().bindingContext, configuration + ).isIrBackend( + true + ).jvmBackendClassResolver( + FirJvmBackendClassResolver(mainModuleComponents) + ).build() + + return IrBackendInput.JvmIrBackendInput( + generationState, + codegenFactory, + dependentIrParts, + mainIrPart, + sourceFiles + ) + } +} diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt index 34b43fbb239..be23455df72 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt @@ -5,37 +5,15 @@ package org.jetbrains.kotlin.test.frontend.fir -import org.jetbrains.kotlin.backend.jvm.JvmIrCodegenFactory -import org.jetbrains.kotlin.backend.jvm.JvmIrDeserializerImpl -import org.jetbrains.kotlin.backend.jvm.serialization.JvmIdSignatureDescriptor -import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys -import org.jetbrains.kotlin.cli.jvm.compiler.NoScopeRecordCliBindingTrace -import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM -import org.jetbrains.kotlin.codegen.ClassBuilderFactories -import org.jetbrains.kotlin.codegen.state.GenerationState -import org.jetbrains.kotlin.container.get -import org.jetbrains.kotlin.fir.FirAnalyzerFacade -import org.jetbrains.kotlin.fir.backend.Fir2IrCommonMemberStorage -import org.jetbrains.kotlin.fir.backend.Fir2IrComponents -import org.jetbrains.kotlin.fir.backend.IrBuiltInsOverFir -import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendClassResolver -import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendExtension -import org.jetbrains.kotlin.fir.backend.jvm.FirJvmKotlinMangler -import org.jetbrains.kotlin.fir.backend.jvm.JvmFir2IrExtensions -import org.jetbrains.kotlin.fir.psi -import org.jetbrains.kotlin.ir.backend.jvm.serialization.JvmDescriptorMangler -import org.jetbrains.kotlin.ir.backend.jvm.serialization.JvmIrMangler -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.resolve.CompilerEnvironment -import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory +import org.jetbrains.kotlin.platform.isCommon +import org.jetbrains.kotlin.platform.isJs +import org.jetbrains.kotlin.platform.jvm.isJvm import org.jetbrains.kotlin.test.backend.ir.IrBackendInput -import org.jetbrains.kotlin.test.directives.CodegenTestDirectives import org.jetbrains.kotlin.test.model.BackendKinds import org.jetbrains.kotlin.test.model.Frontend2BackendConverter import org.jetbrains.kotlin.test.model.FrontendKinds import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices -import org.jetbrains.kotlin.test.services.compilerConfigurationProvider class Fir2IrResultsConverter( testServices: TestServices @@ -44,99 +22,16 @@ class Fir2IrResultsConverter( FrontendKinds.FIR, BackendKinds.IrBackend ) { - override fun transform( - module: TestModule, - inputArtifact: FirOutputArtifact - ): IrBackendInput? { - return try { - transformInternal(module, inputArtifact) - } catch (e: Throwable) { - if (CodegenTestDirectives.IGNORE_FIR2IR_EXCEPTIONS_IF_FIR_CONTAINS_ERRORS in module.directives && inputArtifact.hasErrors) { - null - } else { - throw e - } + private val jvmResultsConverter = Fir2IrJvmResultsConverter(testServices) + private val jsResultsConverter = Fir2IrJsResultsConverter(testServices) + + override fun transform(module: TestModule, inputArtifact: FirOutputArtifact): IrBackendInput? = when { + module.targetPlatform.isJvm() || module.targetPlatform.isCommon() -> { + jvmResultsConverter.transform(module, inputArtifact) } - } - - private fun transformInternal( - module: TestModule, - inputArtifact: FirOutputArtifact - ): IrBackendInput.JvmIrBackendInput { - val compilerConfigurationProvider = testServices.compilerConfigurationProvider - val configuration = compilerConfigurationProvider.getCompilerConfiguration(module) - - val fir2IrExtensions = JvmFir2IrExtensions(configuration, JvmIrDeserializerImpl(), JvmIrMangler) - - // Create and initialize the module and its dependencies - val project = compilerConfigurationProvider.getProject(module) - // TODO: handle fir from light tree - val ktFiles = inputArtifact.mainFirFiles.mapNotNull { it.value.psi as KtFile? } - val sourceFiles = inputArtifact.mainFirFiles.mapNotNull { it.value.sourceFile } - val container = TopDownAnalyzerFacadeForJVM.createContainer( - project, ktFiles, NoScopeRecordCliBindingTrace(), configuration, - compilerConfigurationProvider.getPackagePartProviderFactory(module), - ::FileBasedDeclarationProviderFactory, CompilerEnvironment, - TopDownAnalyzerFacadeForJVM.newModuleSearchScope(project, ktFiles), emptyList() - ) - - val phaseConfig = configuration.get(CLIConfigurationKeys.PHASE_CONFIG) - - val dependentIrParts = mutableListOf() - lateinit var mainIrPart: JvmIrCodegenFactory.JvmIrBackendInput - lateinit var mainModuleComponents: Fir2IrComponents - - val firAnalyzerFacade = inputArtifact.partsForDependsOnModules.last().firAnalyzerFacade as? FirAnalyzerFacade - val generateSignatures = firAnalyzerFacade?.fir2IrConfiguration?.linkViaSignatures == true - - val commonMemberStorage = Fir2IrCommonMemberStorage( - generateSignatures = generateSignatures, - signatureComposerCreator = { JvmIdSignatureDescriptor(JvmDescriptorMangler(null)) }, - manglerCreator = { FirJvmKotlinMangler() } - ) - var irBuiltIns: IrBuiltInsOverFir? = null - - for ((index, firOutputPart) in inputArtifact.partsForDependsOnModules.withIndex()) { - val (irModuleFragment, components, pluginContext) = firOutputPart.firAnalyzerFacade.convertToIr( - fir2IrExtensions, commonMemberStorage, irBuiltIns - ) - irBuiltIns = components.irBuiltIns - - val irPart = JvmIrCodegenFactory.JvmIrBackendInput( - irModuleFragment, - components.symbolTable, - phaseConfig, - components.irProviders, - fir2IrExtensions, - FirJvmBackendExtension(components, irActualizedResult = null), - pluginContext, - notifyCodegenStart = {}, - ) - - if (index < inputArtifact.partsForDependsOnModules.size - 1) { - dependentIrParts.add(irPart) - } else { - mainModuleComponents = components - mainIrPart = irPart - } + module.targetPlatform.isJs() -> { + jsResultsConverter.transform(module, inputArtifact) } - - val codegenFactory = JvmIrCodegenFactory(configuration, phaseConfig) - val generationState = GenerationState.Builder( - project, ClassBuilderFactories.TEST, - container.get(), NoScopeRecordCliBindingTrace().bindingContext, configuration - ).isIrBackend( - true - ).jvmBackendClassResolver( - FirJvmBackendClassResolver(mainModuleComponents) - ).build() - - return IrBackendInput.JvmIrBackendInput( - generationState, - codegenFactory, - dependentIrParts, - mainIrPart, - sourceFiles - ) + else -> error("Unsupported platform: ${module.targetPlatform}") } } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJvmBackend.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJvmBackend.kt index bb9aa857892..1a89eb23211 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJvmBackend.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJvmBackend.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.test.frontend.classic.handlers.ClassicDiagnosticsHan import org.jetbrains.kotlin.test.frontend.classic.handlers.DeclarationsDumpHandler import org.jetbrains.kotlin.test.frontend.classic.handlers.FirTestDataConsistencyHandler import org.jetbrains.kotlin.test.frontend.classic.handlers.OldNewInferenceMetaInfoProcessor -import org.jetbrains.kotlin.test.frontend.fir.Fir2IrResultsConverter +import org.jetbrains.kotlin.test.frontend.fir.Fir2IrJvmResultsConverter import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact import org.jetbrains.kotlin.test.frontend.fir.handlers.FirDiagnosticsHandler @@ -161,7 +161,7 @@ abstract class AbstractFirDiagnosticsTestWithJvmIrBackendBase( get() = ::FirFrontendFacade override val converter: Constructor> - get() = ::Fir2IrResultsConverter + get() = ::Fir2IrJvmResultsConverter override val backendFacade: Constructor> get() = ::JvmIrBackendFacade diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt index a6ea02704a2..48a5307f228 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt @@ -38,6 +38,7 @@ import org.jetbrains.kotlin.test.services.sourceProviders.AdditionalDiagnosticsS import org.jetbrains.kotlin.test.services.sourceProviders.CoroutineHelpersSourceFilesProvider import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.directives.CodegenTestDirectives +import org.jetbrains.kotlin.test.services.JsLibraryProvider abstract class AbstractFirDiagnosticTestBase(val parser: FirParser) : AbstractKotlinCompilerTest() { override fun TestConfigurationBuilder.configuration() { @@ -71,6 +72,8 @@ abstract class AbstractFirWithActualizerDiagnosticsTest(val parser: FirParser) : ::IrDiagnosticsHandler ) } + + useAdditionalService(::JsLibraryProvider) } } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractAsmLikeInstructionListingTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractAsmLikeInstructionListingTest.kt index f00ad2a22b3..4c8878a6742 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractAsmLikeInstructionListingTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractAsmLikeInstructionListingTest.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact import org.jetbrains.kotlin.test.frontend.classic.handlers.ClassicDiagnosticsHandler -import org.jetbrains.kotlin.test.frontend.fir.Fir2IrResultsConverter +import org.jetbrains.kotlin.test.frontend.fir.Fir2IrJvmResultsConverter import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact import org.jetbrains.kotlin.test.frontend.fir.handlers.FirDiagnosticsHandler @@ -111,7 +111,7 @@ abstract class AbstractFirAsmLikeInstructionListingTestBase(val parser: FirParse get() = ::FirFrontendFacade override val frontendToBackendConverter: Constructor> - get() = ::Fir2IrResultsConverter + get() = ::Fir2IrJvmResultsConverter override val backendFacade: Constructor> get() = ::JvmIrBackendFacade diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt index 0f355cdd008..0a6c2c21c02 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.test.builders.configureJvmArtifactsHandlersStep import org.jetbrains.kotlin.test.directives.* import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerWithTargetBackendTest import org.jetbrains.kotlin.test.frontend.classic.* -import org.jetbrains.kotlin.test.frontend.fir.Fir2IrResultsConverter +import org.jetbrains.kotlin.test.frontend.fir.Fir2IrJvmResultsConverter import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact import org.jetbrains.kotlin.test.model.* @@ -89,7 +89,7 @@ abstract class AbstractFirBytecodeListingTestBase(val parser: FirParser) : get() = ::FirFrontendFacade override val frontendToBackendConverter: Constructor> - get() = ::Fir2IrResultsConverter + get() = ::Fir2IrJvmResultsConverter override val backendFacade: Constructor> get() = ::JvmIrBackendFacade diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeTextTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeTextTest.kt index ab4db59c612..ebafae34847 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeTextTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeTextTest.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackend import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact -import org.jetbrains.kotlin.test.frontend.fir.Fir2IrResultsConverter +import org.jetbrains.kotlin.test.frontend.fir.Fir2IrJvmResultsConverter import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact import org.jetbrains.kotlin.test.model.* @@ -92,7 +92,7 @@ open class AbstractFirBytecodeTextTestBase(val parser: FirParser) : AbstractByte get() = ::FirFrontendFacade override val frontendToBackendConverter: Constructor> - get() = ::Fir2IrResultsConverter + get() = ::Fir2IrJvmResultsConverter override val backendFacade: Constructor> get() = ::JvmIrBackendFacade diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractSteppingTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractSteppingTest.kt index 7f50f5459e0..44b14e6409d 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractSteppingTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractSteppingTest.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackend import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact -import org.jetbrains.kotlin.test.frontend.fir.Fir2IrResultsConverter +import org.jetbrains.kotlin.test.frontend.fir.Fir2IrJvmResultsConverter import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact import org.jetbrains.kotlin.test.model.* @@ -75,7 +75,7 @@ open class AbstractFirSteppingTestBase(val parser: FirParser) : AbstractStepping get() = ::FirFrontendFacade override val frontendToBackendConverter: Constructor> - get() = ::Fir2IrResultsConverter + get() = ::Fir2IrJvmResultsConverter override val backendFacade: Constructor> get() = ::JvmIrBackendFacade diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractFirJvmIrTextTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractFirJvmIrTextTest.kt index aa7aef3b668..c5477937854 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractFirJvmIrTextTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractFirJvmIrTextTest.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.test.Constructor import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.backend.ir.IrBackendInput import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder -import org.jetbrains.kotlin.test.frontend.fir.Fir2IrResultsConverter +import org.jetbrains.kotlin.test.frontend.fir.Fir2IrJvmResultsConverter import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact import org.jetbrains.kotlin.test.model.Frontend2BackendConverter @@ -26,7 +26,7 @@ abstract class AbstractFirJvmIrTextTest( override val frontendFacade: Constructor> get() = ::FirFrontendFacade override val converter: Constructor> - get() = ::Fir2IrResultsConverter + get() = ::Fir2IrJvmResultsConverter override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) diff --git a/plugins/allopen/test/org/jetbrains/kotlin/allopen/AbstractBytecodeListingTestForAllOpen.kt b/plugins/allopen/test/org/jetbrains/kotlin/allopen/AbstractBytecodeListingTestForAllOpen.kt index 8ea013106e5..20d582264af 100644 --- a/plugins/allopen/test/org/jetbrains/kotlin/allopen/AbstractBytecodeListingTestForAllOpen.kt +++ b/plugins/allopen/test/org/jetbrains/kotlin/allopen/AbstractBytecodeListingTestForAllOpen.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackend import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact -import org.jetbrains.kotlin.test.frontend.fir.Fir2IrResultsConverter +import org.jetbrains.kotlin.test.frontend.fir.Fir2IrJvmResultsConverter import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact import org.jetbrains.kotlin.test.model.* @@ -78,7 +78,7 @@ open class AbstractFirPsiBytecodeListingTestForAllOpen : override val frontendFacade: Constructor> get() = ::FirFrontendFacade override val frontendToBackendConverter: Constructor> - get() = ::Fir2IrResultsConverter + get() = ::Fir2IrJvmResultsConverter override val backendFacade: Constructor> get() = ::JvmIrBackendFacade diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeBoxTest.kt b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeBoxTest.kt index 24845565a46..35bed2ae418 100644 --- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeBoxTest.kt +++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeBoxTest.kt @@ -13,8 +13,6 @@ import org.jetbrains.kotlin.test.Constructor import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor -import org.jetbrains.kotlin.test.backend.classic.ClassicBackendInput -import org.jetbrains.kotlin.test.backend.classic.ClassicJvmBackendFacade import org.jetbrains.kotlin.test.backend.handlers.IrTextDumpHandler import org.jetbrains.kotlin.test.backend.ir.IrBackendInput import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade @@ -26,12 +24,11 @@ import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.REQUIRES_SEPAR import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.REPORT_ONLY_EXPLICITLY_DEFINED_DEBUG_INFO import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES -import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackendConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact import org.jetbrains.kotlin.test.frontend.classic.handlers.ClassicDiagnosticsHandler -import org.jetbrains.kotlin.test.frontend.fir.Fir2IrResultsConverter +import org.jetbrains.kotlin.test.frontend.fir.Fir2IrJvmResultsConverter import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact import org.jetbrains.kotlin.test.frontend.fir.handlers.FirDiagnosticsHandler @@ -112,7 +109,7 @@ abstract class AbstractParcelizeFirBoxTestBase(val parser: FirParser) : Abstract get() = ::FirFrontendFacade override val frontendToBackendConverter: Constructor> - get() = ::Fir2IrResultsConverter + get() = ::Fir2IrJvmResultsConverter override val backendFacade: Constructor> get() = ::JvmIrBackendFacade