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

[KLIB] Drop useless set

Browse Source
This commit is contained in:
Roman Artemev
2021-07-29 16:16:30 +03:00
committed by teamcityserver
parent aeea7147fe
commit 6ca87dc43f
4 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/BasicIrModuleDeserializer.kt
+1 -3
View File
@@ -97,9 +97,7 @@ abstract class BasicIrModuleDeserializer(
fileLocalDeserializationState.addIdSignature(topLevelSignature) fileLocalDeserializationState.addIdSignature(topLevelSignature)
moduleDeserializationState.enqueueFile(fileLocalDeserializationState) moduleDeserializationState.enqueueFile(fileLocalDeserializationState)
return fileLocalDeserializationState.fileDeserializer.symbolDeserializer.deserializeIrSymbol(idSig, symbolKind).also { return fileLocalDeserializationState.fileDeserializer.symbolDeserializer.deserializeIrSymbol(idSig, symbolKind)
linker.deserializedSymbols.add(it)
}
} }
override val moduleFragment: IrModuleFragment = IrModuleFragmentImpl(moduleDescriptor, linker.builtIns, emptyList()) override val moduleFragment: IrModuleFragment = IrModuleFragmentImpl(moduleDescriptor, linker.builtIns, emptyList())
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt
+2 -5
View File
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.ir.IrBuiltIns import org.jetbrains.kotlin.ir.IrBuiltIns
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
import org.jetbrains.kotlin.ir.builders.TranslationPluginContext import org.jetbrains.kotlin.ir.builders.TranslationPluginContext
import org.jetbrains.kotlin.ir.declarations.IrDeclaration import org.jetbrains.kotlin.ir.declarations.IrDeclaration
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
@@ -50,8 +49,7 @@ abstract class KotlinIrLinker(
abstract val translationPluginContext: TranslationPluginContext? abstract val translationPluginContext: TranslationPluginContext?
internal val triedToDeserializeDeclarationForSymbol = mutableSetOf<IrSymbol>() private val triedToDeserializeDeclarationForSymbol = mutableSetOf<IrSymbol>()
val deserializedSymbols = mutableSetOf<IrSymbol>()
private lateinit var linkerExtensions: Collection<IrDeserializer.IrLinkerExtension> private lateinit var linkerExtensions: Collection<IrDeserializer.IrLinkerExtension>
@@ -103,7 +101,7 @@ abstract class KotlinIrLinker(
private fun findDeserializedDeclarationForSymbol(symbol: IrSymbol): DeclarationDescriptor? { private fun findDeserializedDeclarationForSymbol(symbol: IrSymbol): DeclarationDescriptor? {
if (symbol in triedToDeserializeDeclarationForSymbol || symbol in deserializedSymbols) { if (symbol in triedToDeserializeDeclarationForSymbol) {
return null return null
} }
triedToDeserializeDeclarationForSymbol.add(symbol) triedToDeserializeDeclarationForSymbol.add(symbol)
@@ -205,7 +203,6 @@ abstract class KotlinIrLinker(
finalizeExpectActualLinker() finalizeExpectActualLinker()
fakeOverrideBuilder.provideFakeOverrides() fakeOverrideBuilder.provideFakeOverrides()
triedToDeserializeDeclarationForSymbol.clear() triedToDeserializeDeclarationForSymbol.clear()
deserializedSymbols.clear()
// TODO: fix IrPluginContext to make it not produce additional external reference // TODO: fix IrPluginContext to make it not produce additional external reference
// symbolTable.noUnboundLeft("unbound after fake overrides:") // symbolTable.noUnboundLeft("unbound after fake overrides:")
compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcFileDeserializer.kt
+2 -4
View File
@@ -83,9 +83,7 @@ class IcFileDeserializer(
val topLevelSig = idSig.topLevelSignature() val topLevelSig = idSig.topLevelSignature()
if (idSig in originalFileDeserializer.reversedSignatureIndex) { if (idSig in originalFileDeserializer.reversedSignatureIndex) {
val symbol = originalFileDeserializer.symbolDeserializer.deserializeIrSymbol(idSig, symbolKind).also { val symbol = originalFileDeserializer.symbolDeserializer.deserializeIrSymbol(idSig, symbolKind)
linker.deserializedSymbols.add(it)
}
if (!symbol.isBound) { if (!symbol.isBound) {
topLevelSig.originalEnqueue(this) topLevelSig.originalEnqueue(this)
@@ -216,7 +214,7 @@ class IcFileDeserializer(
fun loadClassOrder(classSignature: IdSignature): List<IrSymbol>? { fun loadClassOrder(classSignature: IdSignature): List<IrSymbol>? {
val bytes = containerSigToOrder[classSignature] ?: return null val bytes = containerSigToOrder[classSignature] ?: return null
return IrLongArrayMemoryReader(bytes).array.map(::deserializeIrSymbol) return IrLongArrayMemoryReader(bytes).array.map { deserializeIrSymbol(it) }
} }
compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcModuleDeserializer.kt
+1 -3
View File
@@ -103,9 +103,7 @@ class IcModuleDeserializer(
val icDeserializer = moduleReversedFileIndex[topLevelSignature] val icDeserializer = moduleReversedFileIndex[topLevelSignature]
?: error("No file for $topLevelSignature (@ $idSig) in module $moduleDescriptor") ?: error("No file for $topLevelSignature (@ $idSig) in module $moduleDescriptor")
val symbol = icDeserializer.originalFileDeserializer.symbolDeserializer.deserializeIrSymbol(idSig, symbolKind).also { val symbol = icDeserializer.originalFileDeserializer.symbolDeserializer.deserializeIrSymbol(idSig, symbolKind)
linker.deserializedSymbols.add(it)
}
if (!symbol.isBound) { if (!symbol.isBound) {
topLevelSignature.originalEnqueue(icDeserializer) topLevelSignature.originalEnqueue(icDeserializer)