From 5b63dad1c3ac0a8d82b4108052ed146ed78810e8 Mon Sep 17 00:00:00 2001 From: Anton Bannykh Date: Wed, 13 May 2020 14:38:48 +0300 Subject: [PATCH] JS IR: fix incremental compilation for stdlib --- .../common/serialization/IncrementalCompilationSupport.kt | 4 ++-- .../backend/common/serialization/IrModuleDeserializer.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IncrementalCompilationSupport.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IncrementalCompilationSupport.kt index e534713c68f..468529b54e4 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IncrementalCompilationSupport.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IncrementalCompilationSupport.kt @@ -114,7 +114,7 @@ class CurrentModuleWithICDeserializer( return this !is DeserializedDescriptor } - override fun init() { + override fun init(delegate: IrModuleDeserializer) { val knownBuiltIns = irBuiltIns.knownBuiltins.map { (it as IrSymbolOwner).symbol }.toSet() symbolTable.forEachPublicSymbol { if (it.descriptor.isDirtyDescriptor()) { // public && non-deserialized should be dirty symbol @@ -124,7 +124,7 @@ class CurrentModuleWithICDeserializer( } } - icDeserializer.init(this) + icDeserializer.init(delegate) } override val klib: IrLibrary diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt index a59966f4acd..93fdb37311c 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt @@ -207,7 +207,7 @@ open class CurrentModuleDeserializer( override fun contains(idSig: IdSignature): Boolean = false // TODO: override fun deserializeIrSymbol(idSig: IdSignature, symbolKind: BinarySymbolData.SymbolKind): IrSymbol { - error("Unreachable execution: there could not be back-links") + error("Unreachable execution: there could not be back-links (sig: $idSig)") } override fun declareIrSymbol(symbol: IrSymbol) {}