azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IR][JS] Drop JsIrFileSerializer.skipExpects parameter

Browse Source 
^KT-61136
This commit is contained in:
Dmitriy Dolovov
2023-08-10 16:01:02 +02:00
committed by Space Team
parent b37bb0be16
commit 5991364028
5 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt
-1
View File
@@ -685,7 +685,6 @@ fun serializeModuleIntoKlib(
moduleFragment.irBuiltins,
expectDescriptorToSymbol,
compatibilityMode,
skipExpects = !configuration.expectActualLinker,
normalizeAbsolutePaths = absolutePathNormalization,
sourceBaseDirs = sourceBaseDirs,
configuration.languageVersionSettings,
compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrFileSerializer.kt
-2
View File
@@ -28,7 +28,6 @@ class JsIrFileSerializer(
declarationTable: DeclarationTable,
expectDescriptorToSymbol: MutableMap<DeclarationDescriptor, IrSymbol>,
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
) {
compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrModuleSerializer.kt
-2
View File
@@ -21,7 +21,6 @@ class JsIrModuleSerializer(
irBuiltIns: IrBuiltIns,
private val expectDescriptorToSymbol: MutableMap<DeclarationDescriptor, IrSymbol>,
compatibilityMode: CompatibilityMode,
val skipExpects: Boolean,
normalizeAbsolutePaths: Boolean,
sourceBaseDirs: Collection<String>,
private val languageVersionSettings: LanguageVersionSettings,
@@ -39,7 +38,6 @@ class JsIrModuleSerializer(
DeclarationTable(globalDeclarationTable),
expectDescriptorToSymbol,
compatibilityMode = compatibilityMode,
skipExpects = skipExpects,
normalizeAbsolutePaths = normalizeAbsolutePaths,
sourceBaseDirs = sourceBaseDirs,
languageVersionSettings = languageVersionSettings,
compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibIrTextTestCase.kt
+2 -5
View File
@@ -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<DeclarationDescriptor, IrSymbol>, skipExpect: Boolean): String {
protected fun serializeModule(irModuleFragment: IrModuleFragment, bindingContext: BindingContext, stdlib: KotlinLibrary, containsErrorCode: Boolean, expectActualSymbols: MutableMap<DeclarationDescriptor, IrSymbol>): String {
val ktFiles = myFiles.psiFiles
val serializedIr = JsIrModuleSerializer(
IrMessageLogger.None,
irModuleFragment.irBuiltins,
expectActualSymbols,
CompatibilityMode.CURRENT,
skipExpect,
false,
emptyList(),
myEnvironment.configuration.languageVersionSettings,
js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt
-1
View File
@@ -531,7 +531,6 @@ class GenerateIrRuntime {
module.irBuiltins,
mutableMapOf(),
CompatibilityMode.CURRENT,
skipExpects = true,
normalizeAbsolutePaths = false,
emptyList(),
configuration.languageVersionSettings,