and in js
diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsDeclarationTable.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsDeclarationTable.kt index 08454e8..5069421 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsDeclarationTable.kt +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsDeclarationTable.kt
@@ -6,6 +6,7 @@ package org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir import org.jetbrains.kotlin.backend.common.serialization.GlobalDeclarationTable +import org.jetbrains.kotlin.backend.common.serialization.TablelessGlobalSignatureComputer import org.jetbrains.kotlin.ir.IrBuiltIns class JsGlobalDeclarationTable( @@ -14,4 +15,10 @@ init { loadKnownBuiltins(builtIns) } +} + +class JsTablelessGlobalSignatureComputer(builtIns: IrBuiltIns) : TablelessGlobalSignatureComputer(JsManglerIr) { + init { + loadKnownBuiltins(builtIns) + } } \ No newline at end of file
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 b47478b..bbe9145 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
@@ -8,6 +8,7 @@ import org.jetbrains.kotlin.backend.common.serialization.DeclarationTable import org.jetbrains.kotlin.backend.common.serialization.IrFileSerializer import org.jetbrains.kotlin.backend.common.serialization.IrSerializationSettings +import org.jetbrains.kotlin.backend.common.serialization.TablelessLocalSignatureComputer import org.jetbrains.kotlin.ir.declarations.IrAnnotationContainer import org.jetbrains.kotlin.ir.declarations.IrFile @@ -21,7 +22,7 @@ class JsIrFileSerializer( settings: IrSerializationSettings, - declarationTable: DeclarationTable.Default, + declarationTable: TablelessLocalSignatureComputer, private val jsIrFileMetadataFactory: JsIrFileMetadataFactory ) : IrFileSerializer(settings, declarationTable) { override fun backendSpecificExplicitRoot(node: IrAnnotationContainer) = node.isJsExportDeclaration()
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 4205a49..d3bc180 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
@@ -8,6 +8,7 @@ import org.jetbrains.kotlin.backend.common.serialization.DeclarationTable import org.jetbrains.kotlin.backend.common.serialization.IrModuleSerializer import org.jetbrains.kotlin.backend.common.serialization.IrSerializationSettings +import org.jetbrains.kotlin.backend.common.serialization.TablelessLocalSignatureComputer import org.jetbrains.kotlin.ir.IrBuiltIns import org.jetbrains.kotlin.ir.IrDiagnosticReporter @@ -18,8 +19,8 @@ private val jsIrFileMetadataFactory: JsIrFileMetadataFactory = JsIrFileEmptyMetadataFactory, ) : IrModuleSerializer<JsIrFileSerializer>(settings, diagnosticReporter) { - override val globalDeclarationTable = JsGlobalDeclarationTable(irBuiltIns) + override val globalDeclarationTable = JsTablelessGlobalSignatureComputer(irBuiltIns) override fun createFileSerializer(settings: IrSerializationSettings): JsIrFileSerializer = - JsIrFileSerializer(settings, DeclarationTable.Default(globalDeclarationTable), jsIrFileMetadataFactory) + JsIrFileSerializer(settings, TablelessLocalSignatureComputer(globalDeclarationTable), jsIrFileMetadataFactory) }