From 6ca87dc43f9dd38cbe1b328b0d1fc379308a0fdd Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Thu, 29 Jul 2021 16:16:30 +0300 Subject: [PATCH] [KLIB] Drop useless set --- .../common/serialization/BasicIrModuleDeserializer.kt | 4 +--- .../kotlin/backend/common/serialization/KotlinIrLinker.kt | 7 ++----- .../kotlin/ir/backend/js/ic/IcFileDeserializer.kt | 6 ++---- .../kotlin/ir/backend/js/ic/IcModuleDeserializer.kt | 4 +--- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/BasicIrModuleDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/BasicIrModuleDeserializer.kt index 853056afcc1..761c4e72c9d 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/BasicIrModuleDeserializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/BasicIrModuleDeserializer.kt @@ -97,9 +97,7 @@ abstract class BasicIrModuleDeserializer( fileLocalDeserializationState.addIdSignature(topLevelSignature) moduleDeserializationState.enqueueFile(fileLocalDeserializationState) - return fileLocalDeserializationState.fileDeserializer.symbolDeserializer.deserializeIrSymbol(idSig, symbolKind).also { - linker.deserializedSymbols.add(it) - } + return fileLocalDeserializationState.fileDeserializer.symbolDeserializer.deserializeIrSymbol(idSig, symbolKind) } override val moduleFragment: IrModuleFragment = IrModuleFragmentImpl(moduleDescriptor, linker.builtIns, emptyList()) diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt index f73515ea740..2095eb42274 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.ir.IrBuiltIns -import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.builders.TranslationPluginContext import org.jetbrains.kotlin.ir.declarations.IrDeclaration import org.jetbrains.kotlin.ir.declarations.IrModuleFragment @@ -50,8 +49,7 @@ abstract class KotlinIrLinker( abstract val translationPluginContext: TranslationPluginContext? - internal val triedToDeserializeDeclarationForSymbol = mutableSetOf() - val deserializedSymbols = mutableSetOf() + private val triedToDeserializeDeclarationForSymbol = mutableSetOf() private lateinit var linkerExtensions: Collection @@ -103,7 +101,7 @@ abstract class KotlinIrLinker( private fun findDeserializedDeclarationForSymbol(symbol: IrSymbol): DeclarationDescriptor? { - if (symbol in triedToDeserializeDeclarationForSymbol || symbol in deserializedSymbols) { + if (symbol in triedToDeserializeDeclarationForSymbol) { return null } triedToDeserializeDeclarationForSymbol.add(symbol) @@ -205,7 +203,6 @@ abstract class KotlinIrLinker( finalizeExpectActualLinker() fakeOverrideBuilder.provideFakeOverrides() triedToDeserializeDeclarationForSymbol.clear() - deserializedSymbols.clear() // TODO: fix IrPluginContext to make it not produce additional external reference // symbolTable.noUnboundLeft("unbound after fake overrides:") diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcFileDeserializer.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcFileDeserializer.kt index 0dffb6c70a8..0bdef9ac426 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcFileDeserializer.kt +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcFileDeserializer.kt @@ -83,9 +83,7 @@ class IcFileDeserializer( val topLevelSig = idSig.topLevelSignature() if (idSig in originalFileDeserializer.reversedSignatureIndex) { - val symbol = originalFileDeserializer.symbolDeserializer.deserializeIrSymbol(idSig, symbolKind).also { - linker.deserializedSymbols.add(it) - } + val symbol = originalFileDeserializer.symbolDeserializer.deserializeIrSymbol(idSig, symbolKind) if (!symbol.isBound) { topLevelSig.originalEnqueue(this) @@ -216,7 +214,7 @@ class IcFileDeserializer( fun loadClassOrder(classSignature: IdSignature): List? { val bytes = containerSigToOrder[classSignature] ?: return null - return IrLongArrayMemoryReader(bytes).array.map(::deserializeIrSymbol) + return IrLongArrayMemoryReader(bytes).array.map { deserializeIrSymbol(it) } } diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcModuleDeserializer.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcModuleDeserializer.kt index 8d909ccf21b..8abc9261b97 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcModuleDeserializer.kt +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcModuleDeserializer.kt @@ -103,9 +103,7 @@ class IcModuleDeserializer( val icDeserializer = moduleReversedFileIndex[topLevelSignature] ?: error("No file for $topLevelSignature (@ $idSig) in module $moduleDescriptor") - val symbol = icDeserializer.originalFileDeserializer.symbolDeserializer.deserializeIrSymbol(idSig, symbolKind).also { - linker.deserializedSymbols.add(it) - } + val symbol = icDeserializer.originalFileDeserializer.symbolDeserializer.deserializeIrSymbol(idSig, symbolKind) if (!symbol.isBound) { topLevelSignature.originalEnqueue(icDeserializer)