chore: remove intern call for signature tags.
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt
index 36068f1..eb20af7 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt
@@ -175,14 +175,13 @@
}
fun makeIrFragmentsGenerators(files: Collection<IrFile>, allModules: Collection<IrModuleFragment>): List<() -> JsIrProgramFragment> {
- val internationService = DefaultIrInternationService()
val exportModelGenerator = ExportModelGenerator(backendContext, generateNamespacesForPackages = !isEsModules)
val exportData = exportModelGenerator.generateExportWithExternals(files)
doStaticMembersLowering(allModules)
return exportData.map {
- { generateProgramFragment(it, minimizedMemberNames = false, internationService) }
+ { generateProgramFragment(it, minimizedMemberNames = false) }
}
}
@@ -210,12 +209,10 @@
val program = JsIrProgram(
exportData.map { data ->
- val internationService = DefaultIrInternationService()
-
JsIrModule(
data.fragment.safeName,
data.fragment.externalModuleName(),
- data.files.map { generateProgramFragment(it, mode.minimizedMemberNames, internationService) }
+ data.files.map { generateProgramFragment(it, mode.minimizedMemberNames) }
)
}
)
@@ -226,11 +223,7 @@
private val generateFilePaths = backendContext.configuration.getBoolean(JSConfigurationKeys.GENERATE_COMMENTS_WITH_FILE_PATH)
private val pathPrefixMap = backendContext.configuration.getMap(JSConfigurationKeys.FILE_PATHS_PREFIX_MAP)
- private fun generateProgramFragment(
- fileExports: IrFileExports,
- minimizedMemberNames: Boolean,
- internationService: IrInternationService
- ): JsIrProgramFragment {
+ private fun generateProgramFragment(fileExports: IrFileExports, minimizedMemberNames: Boolean): JsIrProgramFragment {
val nameGenerator = JsNameLinkingNamer(backendContext, minimizedMemberNames)
val globalNameScope = NameTable<IrDeclaration>()
@@ -319,8 +312,7 @@
val definitionSet = fileExports.file.declarations.toSet()
fun computeTag(declaration: IrDeclaration): String? {
- val signature = (backendContext.irFactory as IdSignatureRetriever).declarationSignature(declaration)
- val tag = signature?.let { internationService.signatureTag(it) }
+ val tag = (backendContext.irFactory as IdSignatureRetriever).declarationSignature(declaration)?.toString()
if (tag == null && declaration !in definitionSet) {
error("signature for ${declaration.render()} not found")
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrInternationService.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrInternationService.kt
index b1bb8ef..7d9c3c4 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrInternationService.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrInternationService.kt
@@ -23,29 +23,18 @@
return type
}
- fun signatureTag(signature: IdSignature): String {
- return signature.toString()
- }
-
- fun clear() {
-
- }
+ fun clear() {}
}
class DefaultIrInternationService : IrInternationService {
private val strings by lazy { hashMapOf<String, String>() }
private val names by lazy { hashMapOf<String, Name>() }
private val simpleTypes by lazy { hashMapOf<Pair<IdSignature, SimpleTypeNullability>, IrSimpleType>() }
- private val signatureToTag by lazy { hashMapOf<IdSignature, String>() }
override fun string(string: String): String {
return strings.getOrPut(string) { string }
}
- override fun signatureTag(signature: IdSignature): String {
- return signatureToTag.getOrPut(signature) { signature.toString() }
- }
-
override fun name(string: String): Name {
return names.getOrPut(string) { super.name(string) }
}
