From a0449892b2ccb2d14e78075707840d46fa670fcb Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Tue, 27 Jul 2021 16:43:42 +0300 Subject: [PATCH] [JS IC] Simplify signatures, don't use `GlobalScopeLocalDeclaration` --- .../kotlin/ir/backend/js/ic/IcSerializer.kt | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcSerializer.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcSerializer.kt index 5b20ecebb85..ce71b35fb8f 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcSerializer.kt +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IcSerializer.kt @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.backend.common.serialization.DeclarationTable import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureSerializer import org.jetbrains.kotlin.backend.common.serialization.signature.PublicIdSignatureComputer import org.jetbrains.kotlin.ir.IrBuiltIns -import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.backend.js.JsMapping import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsGlobalDeclarationTable import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsIrFileSerializer @@ -26,9 +25,6 @@ import org.jetbrains.kotlin.ir.util.IdSignature import org.jetbrains.kotlin.ir.util.file import org.jetbrains.kotlin.ir.util.fileOrNull import org.jetbrains.kotlin.ir.util.isFakeOverride -import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid -import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid -import org.jetbrains.kotlin.ir.visitors.acceptVoid import org.jetbrains.kotlin.library.impl.IrMemoryArrayWriter import org.jetbrains.kotlin.library.impl.IrMemoryLongArrayWriter @@ -162,25 +158,15 @@ class IdSignatureSerializerWithForIC( table: DeclarationTable, localIndexOffset: Long = 0, scopeIndexOffset: Int = 0, -) : IdSignatureSerializer( - publicSignatureBuilder, - table -) { +) : IdSignatureSerializer(publicSignatureBuilder, table) { init { localIndex = localIndexOffset scopeIndex = scopeIndexOffset } override fun IrDeclaration.createFileLocalSignature(parentSignature: IdSignature, localIndex: Long, description: String?): IdSignature { - if (this is IrTypeParameter) { - return IdSignature.GlobalFileLocalSignature(parentSignature, 1000_000_000_000L + index, fileOrNull?.path ?: "") - } return IdSignature.GlobalFileLocalSignature(parentSignature, localIndex, fileOrNull?.path ?: "") } - - override fun IrDeclaration.createScopeLocalSignature(scopeIndex: Int, description: String): IdSignature { - return IdSignature.GlobalScopeLocalDeclaration(scopeIndex, description, fileOrNull?.path ?: "") - } } fun storeOrder(file: IrFile, fileDeclarations: Iterable, idSigToLong: (IrSymbol) -> Long): SerializedOrder {