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

[JS IC] Simplify code a bit

Browse Source
This commit is contained in:
Roman Artemev
2021-08-05 11:12:23 +03:00
committed by teamcityserver
parent 398b545801
commit 7add820f0d
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcModuleDeserializer.kt
+12 -9
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.ir.util.IdSignature
import org.jetbrains.kotlin.ir.util.isEffectivelyExternal import org.jetbrains.kotlin.ir.util.isEffectivelyExternal
import org.jetbrains.kotlin.library.IrLibrary import org.jetbrains.kotlin.library.IrLibrary
import org.jetbrains.kotlin.library.KotlinAbiVersion import org.jetbrains.kotlin.library.KotlinAbiVersion
import org.jetbrains.kotlin.library.KotlinLibrary
import org.jetbrains.kotlin.library.impl.IrLongArrayMemoryReader import org.jetbrains.kotlin.library.impl.IrLongArrayMemoryReader
import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite
import org.jetbrains.kotlin.backend.common.serialization.proto.IrFile as ProtoFile import org.jetbrains.kotlin.backend.common.serialization.proto.IrFile as ProtoFile
@@ -33,7 +34,7 @@ class IcModuleDeserializer(
override val klib: IrLibrary, override val klib: IrLibrary,
override val strategy: DeserializationStrategy, override val strategy: DeserializationStrategy,
private val containsErrorCode: Boolean = false, private val containsErrorCode: Boolean = false,
) : IrModuleDeserializer(moduleDescriptor, KotlinAbiVersion.CURRENT) { ) : IrModuleDeserializer(moduleDescriptor, (klib as KotlinLibrary).versions.abiVersion ?: KotlinAbiVersion.CURRENT) {
private val fileToDeserializerMap = mutableMapOf<IrFile, IrFileDeserializer>() private val fileToDeserializerMap = mutableMapOf<IrFile, IrFileDeserializer>()
@@ -108,7 +109,6 @@ class IcModuleDeserializer(
if (!symbol.isBound) { if (!symbol.isBound) {
topLevelSignature.originalEnqueue(icDeserializer) topLevelSignature.originalEnqueue(icDeserializer)
idSig.enqueue(icDeserializer) idSig.enqueue(icDeserializer)
linker.modulesWithReachableTopLevels.add(this)
} }
return symbol return symbol
@@ -219,16 +219,19 @@ class IcModuleDeserializer(
val icFileDeserializer = fileQueue.removeFirst() val icFileDeserializer = fileQueue.removeFirst()
val signature = signatureQueue.removeFirst() val signature = signatureQueue.removeFirst()
val declaration = icFileDeserializer.deserializeDeclaration(signature) ?: icFileDeserializer.deserializeAnyDeclaration(signature) ?: continue val declaration =
icFileDeserializer.deserializeDeclaration(signature) ?: icFileDeserializer.deserializeAnyDeclaration(signature)
icFileDeserializer.injectCarriers(declaration, signature) if (declaration != null) {
icFileDeserializer.injectCarriers(declaration, signature)
icFileDeserializer.mappingsDeserializer(signature, declaration) icFileDeserializer.mappingsDeserializer(signature, declaration)
// Make sure all members are loaded // Make sure all members are loaded
if (declaration is IrClass) { if (declaration is IrClass) {
icFileDeserializer.loadClassOrder(signature)?.let { icFileDeserializer.loadClassOrder(signature)?.let {
classToDeclarationSymbols[declaration] = it classToDeclarationSymbols[declaration] = it
}
} }
} }
} }