From 59913640287c559e06b7597ce6e80843699c7e5e Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 10 Aug 2023 16:01:02 +0200 Subject: [PATCH] [IR][JS] Drop JsIrFileSerializer.skipExpects parameter ^KT-61136 --- .../src/org/jetbrains/kotlin/ir/backend/js/klib.kt | 1 - .../js/lower/serialization/ir/JsIrFileSerializer.kt | 2 -- .../js/lower/serialization/ir/JsIrModuleSerializer.kt | 2 -- .../jetbrains/kotlin/klib/AbstractKlibIrTextTestCase.kt | 7 ++----- .../org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt | 1 - 5 files changed, 2 insertions(+), 11 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 85b8aeef1b2..0b7847a82ef 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 @@ -685,7 +685,6 @@ fun serializeModuleIntoKlib( moduleFragment.irBuiltins, expectDescriptorToSymbol, compatibilityMode, - skipExpects = !configuration.expectActualLinker, normalizeAbsolutePaths = absolutePathNormalization, sourceBaseDirs = sourceBaseDirs, configuration.languageVersionSettings, 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 8835d888ed2..f3ec4468ef1 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 @@ -28,7 +28,6 @@ class JsIrFileSerializer( declarationTable: DeclarationTable, expectDescriptorToSymbol: MutableMap, compatibilityMode: CompatibilityMode, - skipExpects: Boolean, languageVersionSettings: LanguageVersionSettings, bodiesOnlyForInlines: Boolean = false, normalizeAbsolutePaths: Boolean, @@ -40,7 +39,6 @@ class JsIrFileSerializer( compatibilityMode, languageVersionSettings, bodiesOnlyForInlines = bodiesOnlyForInlines, - skipExpects = skipExpects, 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 fe948be4cc3..e9f8ec0557a 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 @@ -21,7 +21,6 @@ class JsIrModuleSerializer( irBuiltIns: IrBuiltIns, private val expectDescriptorToSymbol: MutableMap, compatibilityMode: CompatibilityMode, - val skipExpects: Boolean, normalizeAbsolutePaths: Boolean, sourceBaseDirs: Collection, private val languageVersionSettings: LanguageVersionSettings, @@ -39,7 +38,6 @@ class JsIrModuleSerializer( DeclarationTable(globalDeclarationTable), expectDescriptorToSymbol, compatibilityMode = compatibilityMode, - skipExpects = skipExpects, normalizeAbsolutePaths = normalizeAbsolutePaths, sourceBaseDirs = sourceBaseDirs, languageVersionSettings = languageVersionSettings, 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 8eb1fc87a92..f66457e7d3a 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibIrTextTestCase.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibIrTextTestCase.kt @@ -104,9 +104,7 @@ abstract class AbstractKlibIrTextTestCase : CodegenTestCase() { val expected = irModule.dump(DumpIrTreeOptions(stableOrder = true, verboseErrorTypes = false)) - val mppProject = - myEnvironment.configuration.languageVersionSettings.getFeatureSupport(LanguageFeature.MultiPlatformProjects) == LanguageFeature.State.ENABLED - val klibPath = serializeModule(irModule, bindingContext, stdlib, ignoreErrors, expectActualSymbols, !mppProject) + val klibPath = serializeModule(irModule, bindingContext, stdlib, ignoreErrors, expectActualSymbols,) val libs = loadKlibFromPath(listOf(runtimeKlibPath, klibPath)) val (stdlib2, klib) = libs val deserializedIrModule = deserializeModule(stdlib2, klib) @@ -144,14 +142,13 @@ abstract class AbstractKlibIrTextTestCase : CodegenTestCase() { return serializePackageFragment(moduleDescriptor, memberScope, ktFile.packageFqName) } - protected fun serializeModule(irModuleFragment: IrModuleFragment, bindingContext: BindingContext, stdlib: KotlinLibrary, containsErrorCode: Boolean, expectActualSymbols: MutableMap, skipExpect: Boolean): String { + protected fun serializeModule(irModuleFragment: IrModuleFragment, bindingContext: BindingContext, stdlib: KotlinLibrary, containsErrorCode: Boolean, expectActualSymbols: MutableMap): String { val ktFiles = myFiles.psiFiles val serializedIr = JsIrModuleSerializer( IrMessageLogger.None, irModuleFragment.irBuiltins, expectActualSymbols, CompatibilityMode.CURRENT, - skipExpect, false, emptyList(), myEnvironment.configuration.languageVersionSettings, 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 bc818bdbb68..adb3760d378 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt @@ -531,7 +531,6 @@ class GenerateIrRuntime { module.irBuiltins, mutableMapOf(), CompatibilityMode.CURRENT, - skipExpects = true, normalizeAbsolutePaths = false, emptyList(), configuration.languageVersionSettings,