From 075010b14e6b53234c15015c213cc072047b1c81 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 21 Nov 2023 13:14:57 +0200 Subject: [PATCH] [Test] Get rid of some properties in IrBackendInput `fir2IrComponents`, `irActualizerResult` and `dependentIrModuleFragments` were used in `IrActualizerAndPluginsFacade`, which was removed in the previous commit --- .../test/backend/handlers/HandlerUtils.kt | 3 +- .../kotlin/test/backend/ir/IrBackendInput.kt | 35 ------------------- .../classic/ClassicFrontend2IrConverter.kt | 6 ---- .../frontend/fir/Fir2IrJsResultsConverter.kt | 5 --- .../frontend/fir/Fir2IrJvmResultsConverter.kt | 4 +-- .../fir/Fir2IrWasmResultsConverter.kt | 4 --- .../test/converters/FirJsKlibBackendFacade.kt | 2 +- .../js/test/converters/JsKlibBackendFacade.kt | 2 +- .../test/ClassicFrontend2NativeIrConverter.kt | 4 +-- .../test/Fir2IrNativeResultsConverter.kt | 2 -- .../converters/FirWasmKlibBackendFacade.kt | 2 +- 11 files changed, 6 insertions(+), 63 deletions(-) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/HandlerUtils.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/HandlerUtils.kt index e7f8163db8d..e854890a70b 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/HandlerUtils.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/HandlerUtils.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages import org.jetbrains.kotlin.diagnostics.rendering.RootDiagnosticRendererFactory import org.jetbrains.kotlin.ir.declarations.IrModuleFragment -import org.jetbrains.kotlin.resolve.jvm.diagnostics.KtDefaultJvmErrorMessages import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.backend.ir.IrBackendInput import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives @@ -29,11 +28,11 @@ import org.jetbrains.kotlin.test.services.* import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly import java.io.File +// TODO: inline this function inline fun IrBackendInput.processAllIrModuleFragments( module: TestModule, processor: (irModuleFragment: IrModuleFragment, moduleName: String) -> Unit ) { - dependentIrModuleFragments.forEach { processor(it, it.name.asString()) } processor(irModuleFragment, module.name) } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/IrBackendInput.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/IrBackendInput.kt index 55c480f5580..516f0ccfa21 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/IrBackendInput.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/IrBackendInput.kt @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext import org.jetbrains.kotlin.backend.jvm.JvmIrCodegenFactory import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector -import org.jetbrains.kotlin.fir.backend.Fir2IrComponents import org.jetbrains.kotlin.fir.backend.FirMangler import org.jetbrains.kotlin.ir.backend.js.KotlinFileSerializedData import org.jetbrains.kotlin.ir.declarations.IrModuleFragment @@ -28,11 +27,6 @@ sealed class IrBackendInput : ResultingArtifact.BackendInput() { abstract val irModuleFragment: IrModuleFragment - /** - * It's actual only with MPP where every source module is separated - */ - abstract val dependentIrModuleFragments: List - /** * Here plugin context can be used as a service for inspecting resulting IR module */ @@ -67,24 +61,10 @@ sealed class IrBackendInput : ResultingArtifact.BackendInput() { */ abstract val firMangler: FirMangler? - /** - * Instance of fir2IrComponents that generated by Fir2Ir or null if this artifact was compiled using the classic frontend. - */ - abstract val fir2IrComponents: Fir2IrComponents? - - /** - * Results of actualization, came from IrActulizer - * - * @see org.jetbrains.kotlin.backend.common.actualizer - * @see org.jetbrains.kotlin.test.backend.ir.IrActualizerAndPluginsFacade - */ - abstract var irActualizerResult: IrActualizedResult? - abstract val diagnosticReporter: BaseDiagnosticsCollector class JsIrBackendInput( override val irModuleFragment: IrModuleFragment, - override val dependentIrModuleFragments: List, override val irPluginContext: IrPluginContext, val sourceFiles: List, val icData: List, @@ -93,31 +73,24 @@ sealed class IrBackendInput : ResultingArtifact.BackendInput() { override val descriptorMangler: KotlinMangler.DescriptorMangler, override val irMangler: KotlinMangler.IrMangler, override val firMangler: FirMangler?, - override val fir2IrComponents: Fir2IrComponents?, - override var irActualizerResult: IrActualizedResult? = null, val serializeSingleFile: (KtSourceFile, IrActualizedResult?) -> ProtoBuf.PackageFragment, ) : IrBackendInput() data class JsIrDeserializedFromKlibBackendInput( override val irModuleFragment: IrModuleFragment, - override val dependentIrModuleFragments: List, override val irPluginContext: IrPluginContext, override val diagnosticReporter: BaseDiagnosticsCollector, override val descriptorMangler: KotlinMangler.DescriptorMangler, override val irMangler: KotlinMangler.IrMangler, override val firMangler: FirMangler?, - override val fir2IrComponents: Fir2IrComponents? ) : IrBackendInput() { override val kind: BackendKind get() = BackendKinds.DeserializedIrBackend - - override var irActualizerResult: IrActualizedResult? = null } class WasmBackendInput( override val irModuleFragment: IrModuleFragment, - override val dependentIrModuleFragments: List, override val irPluginContext: IrPluginContext, val sourceFiles: List, val icData: List, @@ -126,8 +99,6 @@ sealed class IrBackendInput : ResultingArtifact.BackendInput() { override val descriptorMangler: KotlinMangler.DescriptorMangler, override val irMangler: KotlinMangler.IrMangler, override val firMangler: FirMangler?, - override var irActualizerResult: IrActualizedResult? = null, - override val fir2IrComponents: Fir2IrComponents?, val serializeSingleFile: (KtSourceFile, IrActualizedResult?) -> ProtoBuf.PackageFragment, ) : IrBackendInput() @@ -135,13 +106,10 @@ sealed class IrBackendInput : ResultingArtifact.BackendInput() { val state: GenerationState, val codegenFactory: JvmIrCodegenFactory, val backendInput: JvmIrCodegenFactory.JvmIrBackendInput, - override val dependentIrModuleFragments: List, val sourceFiles: List, override val descriptorMangler: KotlinMangler.DescriptorMangler, override val irMangler: KotlinMangler.IrMangler, override val firMangler: FirMangler?, - override var irActualizerResult: IrActualizedResult? = null, - override val fir2IrComponents: Fir2IrComponents?, ) : IrBackendInput() { override val irModuleFragment: IrModuleFragment get() = backendInput.irModuleFragment @@ -158,13 +126,10 @@ sealed class IrBackendInput : ResultingArtifact.BackendInput() { // So, other fields are actually not needed: source files, icData, error flag, serialization lambda, etc... class NativeBackendInput( override val irModuleFragment: IrModuleFragment, - override val dependentIrModuleFragments: List, override val irPluginContext: IrPluginContext, override val diagnosticReporter: BaseDiagnosticsCollector, override val descriptorMangler: KotlinMangler.DescriptorMangler, override val irMangler: KotlinMangler.IrMangler, override val firMangler: FirMangler?, - override var irActualizerResult: IrActualizedResult? = null, - override val fir2IrComponents: Fir2IrComponents? ) : IrBackendInput() } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontend2IrConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontend2IrConverter.kt index cb2f3abb483..a649b7157a8 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontend2IrConverter.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontend2IrConverter.kt @@ -74,12 +74,10 @@ class ClassicFrontend2IrConverter( state, codegenFactory, conversionResult, - dependentIrModuleFragments = emptyList(), sourceFiles = emptyList(), descriptorMangler = conversionResult.symbolTable.signaturer.mangler, irMangler = JvmIrMangler, firMangler = null, - fir2IrComponents = null, ) } @@ -111,7 +109,6 @@ class ClassicFrontend2IrConverter( return IrBackendInput.JsIrBackendInput( moduleFragment, - dependentIrModuleFragments = emptyList(), pluginContext, sourceFiles.map(::KtPsiSourceFile), icData, @@ -120,7 +117,6 @@ class ClassicFrontend2IrConverter( descriptorMangler = (pluginContext.symbolTable as SymbolTable).signaturer.mangler, irMangler = JsManglerIr, firMangler = null, - fir2IrComponents = null, ) { file, _ -> metadataSerializer.serializeScope(file, analysisResult.bindingContext, moduleFragment.descriptor) } @@ -155,7 +151,6 @@ class ClassicFrontend2IrConverter( return IrBackendInput.WasmBackendInput( moduleFragment, - dependentIrModuleFragments = emptyList(), pluginContext, sourceFiles.map(::KtPsiSourceFile), icData, @@ -164,7 +159,6 @@ class ClassicFrontend2IrConverter( descriptorMangler = (pluginContext.symbolTable as SymbolTable).signaturer.mangler, irMangler = JsManglerIr, firMangler = null, - fir2IrComponents = null, ) { file, _ -> metadataSerializer.serializeScope(file, analysisResult.bindingContext, moduleFragment.descriptor) } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt index 3959a278e53..de939f4a72a 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt @@ -76,7 +76,6 @@ class Fir2IrJsResultsConverter( val sourceFiles = mutableListOf() val firFilesAndComponentsBySourceFile = mutableMapOf>() lateinit var mainPluginContext: IrPluginContext - lateinit var mainComponents: Fir2IrComponents var irBuiltIns: IrBuiltInsOverFir? = null val commonMemberStorage = Fir2IrCommonMemberStorage(IdSignatureDescriptor(JsManglerDesc), FirJsKotlinMangler()) @@ -101,7 +100,6 @@ class Fir2IrJsResultsConverter( dependentIrParts.add(irModuleFragment) } else { mainIrPart = irModuleFragment - mainComponents = components } sourceFiles.addAll(part.firFiles.mapNotNull { it.value.sourceFile }) @@ -117,7 +115,6 @@ class Fir2IrJsResultsConverter( val result = IrBackendInput.JsIrBackendInput( mainIrPart, - dependentIrParts, mainPluginContext, sourceFiles, configuration.incrementalDataProvider?.getSerializedData(sourceFiles) ?: emptyList(), @@ -126,7 +123,6 @@ class Fir2IrJsResultsConverter( descriptorMangler = commonMemberStorage.symbolTable.signaturer.mangler, irMangler = irMangler, firMangler = commonMemberStorage.firSignatureComposer.mangler, - fir2IrComponents = mainComponents ) { file, irActualizedResult -> val (firFile, components) = firFilesAndComponentsBySourceFile[file] ?: error("cannot find FIR file by source file ${file.name} (${file.path})") @@ -147,7 +143,6 @@ class Fir2IrJsResultsConverter( configuration.languageVersionSettings, ) } - return result } } 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 index 28a6a67588a..8d1dd4e78d4 100644 --- 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 @@ -118,7 +118,7 @@ class Fir2IrJvmResultsConverter( FirJvmVisibilityConverter, DefaultBuiltIns.Instance, typeContextProvider = ::JvmIrTypeSystemContext, - ) + ) irBuiltIns = components.irBuiltIns if (index < inputArtifact.partsForDependsOnModules.size - 1) { @@ -154,12 +154,10 @@ class Fir2IrJvmResultsConverter( generationState, codegenFactory, backendInput, - dependentIrParts, sourceFiles, descriptorMangler = commonMemberStorage.symbolTable.signaturer.mangler, irMangler = irMangler, firMangler = commonMemberStorage.firSignatureComposer.mangler, - fir2IrComponents = mainModuleComponents ) return result diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrWasmResultsConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrWasmResultsConverter.kt index cf5ecb47944..2a7ecbff0f7 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrWasmResultsConverter.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrWasmResultsConverter.kt @@ -79,7 +79,6 @@ class Fir2IrWasmResultsConverter( val sourceFiles = mutableListOf() val firFilesAndComponentsBySourceFile = mutableMapOf>() lateinit var mainPluginContext: IrPluginContext - lateinit var mainComponents: Fir2IrComponents var irBuiltIns: IrBuiltInsOverFir? = null val commonMemberStorage = Fir2IrCommonMemberStorage(IdSignatureDescriptor(JsManglerDesc), FirJsKotlinMangler()) @@ -102,7 +101,6 @@ class Fir2IrWasmResultsConverter( dependentIrParts.add(irModuleFragment) } else { mainIrPart = irModuleFragment - mainComponents = components } sourceFiles.addAll(part.firFiles.mapNotNull { it.value.sourceFile }) @@ -118,7 +116,6 @@ class Fir2IrWasmResultsConverter( return IrBackendInput.WasmBackendInput( mainIrPart, - dependentIrParts, mainPluginContext, sourceFiles, configuration.incrementalDataProvider?.getSerializedData(sourceFiles) ?: emptyList(), @@ -127,7 +124,6 @@ class Fir2IrWasmResultsConverter( descriptorMangler = commonMemberStorage.symbolTable.signaturer.mangler, irMangler = JsManglerIr, firMangler = commonMemberStorage.firSignatureComposer.mangler, - fir2IrComponents = mainComponents, ) { file, irActualizedResult -> val (firFile, components) = firFilesAndComponentsBySourceFile[file] ?: error("cannot find FIR file by source file ${file.name} (${file.path})") diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/FirJsKlibBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/FirJsKlibBackendFacade.kt index 2a3cb3668bd..2866c52f501 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/FirJsKlibBackendFacade.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/FirJsKlibBackendFacade.kt @@ -74,7 +74,7 @@ class FirJsKlibBackendFacade( abiVersion = KotlinAbiVersion.CURRENT, // TODO get from test file data jsOutputName = null ) { - inputArtifact.serializeSingleFile(it, inputArtifact.irActualizerResult) + inputArtifact.serializeSingleFile(it, TODO("Will be fixed in the next commit")) } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt index fbeecbbd9ad..e76e7abe1e7 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt @@ -63,7 +63,7 @@ class JsKlibBackendFacade( abiVersion = KotlinAbiVersion.CURRENT, // TODO get from test file data jsOutputName = null ) { - inputArtifact.serializeSingleFile(it, inputArtifact.irActualizerResult) + inputArtifact.serializeSingleFile(it, TODO("Will be fixed in the next commit")) } } diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/ClassicFrontend2NativeIrConverter.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/ClassicFrontend2NativeIrConverter.kt index 4e794143f76..c9d464653de 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/ClassicFrontend2NativeIrConverter.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/ClassicFrontend2NativeIrConverter.kt @@ -127,13 +127,11 @@ class ClassicFrontend2NativeIrConverter( return IrBackendInput.NativeBackendInput( moduleFragment, - dependentIrModuleFragments = emptyList(), pluginContext, diagnosticReporter = DiagnosticReporterFactory.createReporter(), descriptorMangler = (pluginContext.symbolTable as SymbolTable).signaturer.mangler, irMangler = KonanManglerIr, firMangler = null, - fir2IrComponents = null, ) } @@ -145,4 +143,4 @@ class ClassicFrontend2NativeIrConverter( CastCompatibleKotlinNativeClassLoader.kotlinNativeClassLoader.classLoader ).kotlin } -} \ No newline at end of file +} diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/Fir2IrNativeResultsConverter.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/Fir2IrNativeResultsConverter.kt index 95d433a785a..cf218a800f0 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/Fir2IrNativeResultsConverter.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/Fir2IrNativeResultsConverter.kt @@ -114,13 +114,11 @@ class Fir2IrNativeResultsConverter( val result = IrBackendInput.NativeBackendInput( mainIrPart, - dependentIrParts, mainPluginContext, diagnosticReporter = diagnosticReporter, descriptorMangler = commonMemberStorage.symbolTable.signaturer.mangler, irMangler = KonanManglerIr, firMangler = commonMemberStorage.firSignatureComposer.mangler, - fir2IrComponents = null, ) return result diff --git a/wasm/wasm.tests/test/org/jetbrains/kotlin/wasm/test/converters/FirWasmKlibBackendFacade.kt b/wasm/wasm.tests/test/org/jetbrains/kotlin/wasm/test/converters/FirWasmKlibBackendFacade.kt index d7927b2b7a9..cb83362be75 100644 --- a/wasm/wasm.tests/test/org/jetbrains/kotlin/wasm/test/converters/FirWasmKlibBackendFacade.kt +++ b/wasm/wasm.tests/test/org/jetbrains/kotlin/wasm/test/converters/FirWasmKlibBackendFacade.kt @@ -74,7 +74,7 @@ class FirWasmKlibBackendFacade( abiVersion = KotlinAbiVersion.CURRENT, // TODO get from test file data jsOutputName = null ) { - inputArtifact.serializeSingleFile(it, inputArtifact.irActualizerResult) + inputArtifact.serializeSingleFile(it, TODO("Will be fixed in the next commit")) } }