From b7211c171fadb01240e6060bbda8a0cc427f607d Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 10 Aug 2023 16:37:28 +0200 Subject: [PATCH] [IR][JS] Drop JsIrFileSerializer.expectDescriptorToSymbol parameter ^KT-61136 --- .../src/org/jetbrains/kotlin/ir/backend/js/klib.kt | 3 +-- .../js/lower/serialization/ir/JsIrFileSerializer.kt | 8 ++------ .../js/lower/serialization/ir/JsIrModuleSerializer.kt | 4 ---- .../jetbrains/kotlin/klib/AbstractKlibIrTextTestCase.kt | 5 ++--- .../org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt | 1 - 5 files changed, 5 insertions(+), 16 deletions(-) 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 0b7847a82ef..505f0e5d4db 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 @@ -662,7 +662,7 @@ fun serializeModuleIntoKlib( klibPath: String, dependencies: List, moduleFragment: IrModuleFragment, - expectDescriptorToSymbol: MutableMap, + @Suppress("UNUSED_PARAMETER") expectDescriptorToSymbol: MutableMap, // TODO: to be removed later cleanFiles: List, nopack: Boolean, perFile: Boolean, @@ -683,7 +683,6 @@ fun serializeModuleIntoKlib( JsIrModuleSerializer( messageLogger, moduleFragment.irBuiltins, - expectDescriptorToSymbol, compatibilityMode, normalizeAbsolutePaths = absolutePathNormalization, sourceBaseDirs = sourceBaseDirs, diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrFileSerializer.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrFileSerializer.kt index f3ec4468ef1..5d3accc7632 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrFileSerializer.kt +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrFileSerializer.kt @@ -10,13 +10,11 @@ import org.jetbrains.kotlin.backend.common.serialization.CompatibilityMode import org.jetbrains.kotlin.backend.common.serialization.DeclarationTable import org.jetbrains.kotlin.backend.common.serialization.IrFileSerializer import org.jetbrains.kotlin.config.LanguageVersionSettings -import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.ir.declarations.IrAnnotationContainer import org.jetbrains.kotlin.ir.declarations.IrDeclarationWithName import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.ir.expressions.IrConst import org.jetbrains.kotlin.ir.expressions.IrConstructorCall -import org.jetbrains.kotlin.ir.symbols.IrSymbol import org.jetbrains.kotlin.ir.util.IrMessageLogger import org.jetbrains.kotlin.ir.util.getAnnotation import org.jetbrains.kotlin.ir.util.hasAnnotation @@ -26,7 +24,6 @@ import org.jetbrains.kotlin.name.FqName class JsIrFileSerializer( messageLogger: IrMessageLogger, declarationTable: DeclarationTable, - expectDescriptorToSymbol: MutableMap, compatibilityMode: CompatibilityMode, languageVersionSettings: LanguageVersionSettings, bodiesOnlyForInlines: Boolean = false, @@ -35,9 +32,8 @@ class JsIrFileSerializer( ) : IrFileSerializer( messageLogger, declarationTable, - expectDescriptorToSymbol, - compatibilityMode, - languageVersionSettings, + compatibilityMode = compatibilityMode, + languageVersionSettings = languageVersionSettings, bodiesOnlyForInlines = bodiesOnlyForInlines, normalizeAbsolutePaths = normalizeAbsolutePaths, sourceBaseDirs = sourceBaseDirs diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrModuleSerializer.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrModuleSerializer.kt index e9f8ec0557a..a00d101529d 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrModuleSerializer.kt +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrModuleSerializer.kt @@ -10,16 +10,13 @@ import org.jetbrains.kotlin.backend.common.serialization.DeclarationTable import org.jetbrains.kotlin.backend.common.serialization.IdSignatureClashTracker import org.jetbrains.kotlin.backend.common.serialization.IrModuleSerializer import org.jetbrains.kotlin.config.LanguageVersionSettings -import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.ir.IrBuiltIns import org.jetbrains.kotlin.ir.declarations.IrFile -import org.jetbrains.kotlin.ir.symbols.IrSymbol import org.jetbrains.kotlin.ir.util.IrMessageLogger class JsIrModuleSerializer( messageLogger: IrMessageLogger, irBuiltIns: IrBuiltIns, - private val expectDescriptorToSymbol: MutableMap, compatibilityMode: CompatibilityMode, normalizeAbsolutePaths: Boolean, sourceBaseDirs: Collection, @@ -36,7 +33,6 @@ class JsIrModuleSerializer( JsIrFileSerializer( messageLogger, DeclarationTable(globalDeclarationTable), - expectDescriptorToSymbol, compatibilityMode = compatibilityMode, normalizeAbsolutePaths = normalizeAbsolutePaths, sourceBaseDirs = sourceBaseDirs, diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibIrTextTestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibIrTextTestCase.kt index f66457e7d3a..43becbb7209 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibIrTextTestCase.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibIrTextTestCase.kt @@ -104,7 +104,7 @@ abstract class AbstractKlibIrTextTestCase : CodegenTestCase() { val expected = irModule.dump(DumpIrTreeOptions(stableOrder = true, verboseErrorTypes = false)) - val klibPath = serializeModule(irModule, bindingContext, stdlib, ignoreErrors, expectActualSymbols,) + val klibPath = serializeModule(irModule, bindingContext, stdlib, ignoreErrors) val libs = loadKlibFromPath(listOf(runtimeKlibPath, klibPath)) val (stdlib2, klib) = libs val deserializedIrModule = deserializeModule(stdlib2, klib) @@ -142,12 +142,11 @@ abstract class AbstractKlibIrTextTestCase : CodegenTestCase() { return serializePackageFragment(moduleDescriptor, memberScope, ktFile.packageFqName) } - protected fun serializeModule(irModuleFragment: IrModuleFragment, bindingContext: BindingContext, stdlib: KotlinLibrary, containsErrorCode: Boolean, expectActualSymbols: MutableMap): String { + protected fun serializeModule(irModuleFragment: IrModuleFragment, bindingContext: BindingContext, stdlib: KotlinLibrary, containsErrorCode: Boolean): String { val ktFiles = myFiles.psiFiles val serializedIr = JsIrModuleSerializer( IrMessageLogger.None, irModuleFragment.irBuiltins, - expectActualSymbols, CompatibilityMode.CURRENT, false, emptyList(), 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 adb3760d378..101a8b63b9a 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt @@ -529,7 +529,6 @@ class GenerateIrRuntime { val serializedIr = JsIrModuleSerializer( IrMessageLogger.None, module.irBuiltins, - mutableMapOf(), CompatibilityMode.CURRENT, normalizeAbsolutePaths = false, emptyList(),