IR deserialization, JS: Drop useless `containsErrorCode` parameter
^KT-79958
diff --git a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/irForKlib.kt b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/irForKlib.kt
index 5a2cc91..9c308f5 100644
--- a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/irForKlib.kt
+++ b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/irForKlib.kt
@@ -80,7 +80,7 @@
builtIns = psi2IrContext.irBuiltIns,
messageCollector = messageCollector,
),
- ICData(icData.map { it.irData!! }, containsErrorCode = false),
+ ICData(icData.map { it.irData!! }),
stubGenerator = stubGenerator
)
diff --git a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/pipeline/web/WebKlibSerializationPipelinePhase.kt b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/pipeline/web/WebKlibSerializationPipelinePhase.kt
index 0031dbe..78b8f05 100644
--- a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/pipeline/web/WebKlibSerializationPipelinePhase.kt
+++ b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/pipeline/web/WebKlibSerializationPipelinePhase.kt
@@ -27,7 +27,7 @@
name = "JsKlibSerializationPipelinePhase",
) {
override fun executePhase(input: JsFir2IrPipelineArtifact): JsSerializedKlibPipelineArtifact? {
- val (fir2IrResult, firOutput, configuration, diagnosticCollector, moduleStructure, hasErrors) = input
+ val (fir2IrResult, firOutput, configuration, diagnosticCollector, moduleStructure) = input
val outputKlibPath = configuration.computeOutputKlibPath()
serializeFirKlib(
@@ -36,12 +36,10 @@
fir2IrActualizedResult = fir2IrResult,
outputKlibPath = outputKlibPath,
nopack = configuration.produceKlibDir,
- messageCollector = configuration.messageCollector,
diagnosticsReporter = diagnosticCollector,
jsOutputName = configuration.perModuleOutputName,
useWasmPlatform = configuration.wasmCompilation,
wasmTarget = configuration.wasmTarget,
- hasErrors = hasErrors,
)
return JsSerializedKlibPipelineArtifact(
outputKlibPath,
@@ -56,12 +54,10 @@
fir2IrActualizedResult: Fir2IrActualizedResult,
outputKlibPath: String,
nopack: Boolean,
- messageCollector: MessageCollector,
diagnosticsReporter: BaseDiagnosticsCollector,
jsOutputName: String?,
useWasmPlatform: Boolean,
wasmTarget: WasmTarget?,
- hasErrors: Boolean = messageCollector.hasErrors() || diagnosticsReporter.hasErrors,
) {
val fir2KlibMetadataSerializer = Fir2KlibMetadataSerializer(
moduleStructure.compilerConfiguration,
@@ -83,7 +79,6 @@
irBuiltIns = fir2IrActualizedResult.irBuiltIns,
cleanFiles = icData ?: emptyList(),
nopack = nopack,
- containsErrorCode = hasErrors,
jsOutputName = jsOutputName,
builtInsPlatform = if (useWasmPlatform) BuiltInsPlatform.WASM else BuiltInsPlatform.JS,
wasmTarget = wasmTarget,
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IncrementalCompilationSupport.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IncrementalCompilationSupport.kt
index 235bcf4..db3fc62 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IncrementalCompilationSupport.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IncrementalCompilationSupport.kt
@@ -23,7 +23,7 @@
import org.jetbrains.kotlin.library.SerializedIrFile
import org.jetbrains.kotlin.library.impl.*
-class ICData(val icData: List<SerializedIrFile>, val containsErrorCode: Boolean)
+class ICData(val icData: List<SerializedIrFile>)
class ICKotlinLibrary(private val icData: List<SerializedIrFile>) : IrLibrary {
override val hasIr get() = true
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 fb5b0ba..de482c6 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
@@ -107,7 +107,6 @@
irBuiltIns = irBuiltIns,
cleanFiles = icData,
nopack = nopack,
- containsErrorCode = modulesStructure.jsFrontEndResult.hasErrors,
jsOutputName = jsOutputName,
builtInsPlatform = builtInsPlatform,
wasmTarget = wasmTarget,
@@ -423,7 +422,6 @@
irBuiltIns: IrBuiltIns,
cleanFiles: List<KotlinFileSerializedData>,
nopack: Boolean,
- containsErrorCode: Boolean = false,
jsOutputName: String?,
builtInsPlatform: BuiltInsPlatform = BuiltInsPlatform.JS,
wasmTarget: WasmTarget? = null,
@@ -505,9 +503,6 @@
if (wasmTargets.isNotEmpty()) {
p.setProperty(KLIB_PROPERTY_WASM_TARGETS, wasmTargets.joinToString(" ") { it.alias })
}
- if (containsErrorCode) {
- p.setProperty(KLIB_PROPERTY_CONTAINS_ERROR_CODE, "true")
- }
val fingerprints = fullSerializedIr.files.sortedBy { it.path }.map { SerializedIrFileFingerprint(it) }
p.setProperty(KLIB_PROPERTY_SERIALIZED_IR_FILE_FINGERPRINTS, fingerprints.joinIrFileFingerprints())
diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt
index 4f53e27..08847a6 100644
--- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt
+++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt
@@ -20,7 +20,6 @@
import org.jetbrains.kotlin.library.IrLibrary
import org.jetbrains.kotlin.library.KotlinAbiVersion
import org.jetbrains.kotlin.library.KotlinLibrary
-import org.jetbrains.kotlin.library.containsErrorCode
import org.jetbrains.kotlin.utils.addToStdlib.runIf
import org.jetbrains.kotlin.utils.memoryOptimizedMap
@@ -57,9 +56,6 @@
override fun isBuiltInModule(moduleDescriptor: ModuleDescriptor): Boolean =
moduleDescriptor === moduleDescriptor.builtIns.builtInsModule
- private val IrLibrary.libContainsErrorCode: Boolean
- get() = this is KotlinLibrary && this.containsErrorCode
-
override fun createModuleDeserializer(
moduleDescriptor: ModuleDescriptor,
klib: KotlinLibrary?,
@@ -68,15 +64,15 @@
require(klib != null) { "Expecting kotlin library" }
val libraryAbiVersion = klib.versions.abiVersion ?: KotlinAbiVersion.CURRENT
return when (val lazyIrGenerator = stubGenerator) {
- null -> JsModuleDeserializer(moduleDescriptor, klib, strategyResolver, libraryAbiVersion, klib.libContainsErrorCode)
+ null -> JsModuleDeserializer(moduleDescriptor, klib, strategyResolver, libraryAbiVersion)
else -> JsLazyIrModuleDeserializer(moduleDescriptor, libraryAbiVersion, builtIns, lazyIrGenerator)
}
}
private val deserializedFilesInKlibOrder = mutableMapOf<IrModuleFragment, List<IrFile>>()
- private inner class JsModuleDeserializer(moduleDescriptor: ModuleDescriptor, klib: IrLibrary, strategyResolver: (String) -> DeserializationStrategy, libraryAbiVersion: KotlinAbiVersion, allowErrorCode: Boolean) :
- BasicIrModuleDeserializer(this, moduleDescriptor, klib, strategyResolver, libraryAbiVersion, allowErrorCode) {
+ private inner class JsModuleDeserializer(moduleDescriptor: ModuleDescriptor, klib: IrLibrary, strategyResolver: (String) -> DeserializationStrategy, libraryAbiVersion: KotlinAbiVersion) :
+ BasicIrModuleDeserializer(this, moduleDescriptor, klib, strategyResolver, libraryAbiVersion) {
override fun init(delegate: IrModuleDeserializer) {
super.init(delegate)
@@ -89,7 +85,7 @@
icData?.let {
return CurrentModuleWithICDeserializer(currentModuleDeserializer, symbolTable, builtIns, it.icData) { lib ->
- JsModuleDeserializer(currentModuleDeserializer.moduleDescriptor, lib, currentModuleDeserializer.strategyResolver, KotlinAbiVersion.CURRENT, it.containsErrorCode)
+ JsModuleDeserializer(currentModuleDeserializer.moduleDescriptor, lib, currentModuleDeserializer.strategyResolver, KotlinAbiVersion.CURRENT)
}
}
return currentModuleDeserializer
diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt
index ca5f8c3..a34e43f 100644
--- a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt
+++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt
@@ -39,7 +39,6 @@
const val KLIB_PROPERTY_DEPENDS = "depends"
const val KLIB_PROPERTY_PACKAGE = "package"
const val KLIB_PROPERTY_BUILTINS_PLATFORM = "builtins_platform"
-const val KLIB_PROPERTY_CONTAINS_ERROR_CODE = "contains_error_code"
// Native-specific:
const val KLIB_PROPERTY_INTEROP = "interop"
@@ -188,9 +187,6 @@
val BaseKotlinLibrary.wasmTargets: List<String>
get() = manifestProperties.propertyList(KLIB_PROPERTY_WASM_TARGETS)
-val KotlinLibrary.containsErrorCode: Boolean
- get() = manifestProperties.getProperty(KLIB_PROPERTY_CONTAINS_ERROR_CODE) == "true"
-
val BaseKotlinLibrary.commonizerTarget: String?
get() = manifestProperties.getProperty(KLIB_PROPERTY_COMMONIZER_TARGET)
diff --git a/js/js.tests/testFixtures/org/jetbrains/kotlin/incremental/FirAbstractInvalidationTest.kt b/js/js.tests/testFixtures/org/jetbrains/kotlin/incremental/FirAbstractInvalidationTest.kt
index 48224b5..a1cea88 100644
--- a/js/js.tests/testFixtures/org/jetbrains/kotlin/incremental/FirAbstractInvalidationTest.kt
+++ b/js/js.tests/testFixtures/org/jetbrains/kotlin/incremental/FirAbstractInvalidationTest.kt
@@ -156,7 +156,6 @@
fir2IrActualizedResult = transformedResult,
outputKlibPath = outputKlibFile.absolutePath,
nopack = false,
- messageCollector = messageCollector,
diagnosticsReporter = diagnosticsReporter,
jsOutputName = moduleName,
useWasmPlatform = false,
diff --git a/js/js.tests/testFixtures/org/jetbrains/kotlin/js/test/converters/ClassicJsKlibSerializerFacade.kt b/js/js.tests/testFixtures/org/jetbrains/kotlin/js/test/converters/ClassicJsKlibSerializerFacade.kt
index 7a4905e..15ca4b9 100644
--- a/js/js.tests/testFixtures/org/jetbrains/kotlin/js/test/converters/ClassicJsKlibSerializerFacade.kt
+++ b/js/js.tests/testFixtures/org/jetbrains/kotlin/js/test/converters/ClassicJsKlibSerializerFacade.kt
@@ -65,7 +65,6 @@
irBuiltIns = inputArtifact.irPluginContext.irBuiltIns,
cleanFiles = inputArtifact.icData,
nopack = true,
- containsErrorCode = inputArtifact.hasErrors,
jsOutputName = null
)
}
diff --git a/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/incremental/FirWasmAbstractInvalidationTest.kt b/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/incremental/FirWasmAbstractInvalidationTest.kt
index 99d6a2e..71e40e5 100644
--- a/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/incremental/FirWasmAbstractInvalidationTest.kt
+++ b/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/incremental/FirWasmAbstractInvalidationTest.kt
@@ -138,7 +138,6 @@
fir2IrActualizedResult = fir2IrActualizedResult,
outputKlibPath = outputKlibFile.absolutePath,
nopack = false,
- messageCollector = messageCollector,
diagnosticsReporter = diagnosticsReporter,
jsOutputName = moduleName,
useWasmPlatform = true,
diff --git a/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/wasm/test/converters/FirWasmKlibSerializerFacade.kt b/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/wasm/test/converters/FirWasmKlibSerializerFacade.kt
index 29ca363..d423f5c 100644
--- a/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/wasm/test/converters/FirWasmKlibSerializerFacade.kt
+++ b/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/wasm/test/converters/FirWasmKlibSerializerFacade.kt
@@ -69,7 +69,6 @@
irBuiltIns = inputArtifact.irPluginContext.irBuiltIns,
cleanFiles = inputArtifact.icData,
nopack = true,
- containsErrorCode = inputArtifact.hasErrors,
jsOutputName = null,
builtInsPlatform = BuiltInsPlatform.WASM,
wasmTarget = target,
