From c194f12cb494d24f0c6d1ceee7ccee77b78697cc Mon Sep 17 00:00:00 2001 From: Anastasiya Shadrina Date: Wed, 3 Nov 2021 16:49:33 +0700 Subject: [PATCH] [IR] Generate context receivers count for PersistentIr --- .../ir/declarations/persistent/PersistentIrFunctionCommon.kt | 4 ++-- .../jetbrains/kotlin/ir/persistentIrGenerator/Constructor.kt | 1 + .../org/jetbrains/kotlin/ir/persistentIrGenerator/Function.kt | 1 + .../kotlin/ir/persistentIrGenerator/PersistentIrGenerator.kt | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/ir/ir.tree.persistent/gen/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunctionCommon.kt b/compiler/ir/ir.tree.persistent/gen/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunctionCommon.kt index cef4d25a24f..2bcb135b186 100644 --- a/compiler/ir/ir.tree.persistent/gen/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunctionCommon.kt +++ b/compiler/ir/ir.tree.persistent/gen/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunctionCommon.kt @@ -135,6 +135,8 @@ internal abstract class PersistentIrFunctionCommon( } } + override var contextReceiverParametersCount: Int = 0 + override var valueParametersField: List = emptyList() override var valueParametersSymbolField: List @@ -152,8 +154,6 @@ internal abstract class PersistentIrFunctionCommon( } } - override var contextReceiverParametersCount: Int = 0 - override var bodyField: IrBody? = null override var body: IrBody? diff --git a/compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/Constructor.kt b/compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/Constructor.kt index b3e4fb41a49..c417a69924b 100644 --- a/compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/Constructor.kt +++ b/compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/Constructor.kt @@ -55,6 +55,7 @@ internal fun PersistentIrGenerator.generateConstructor() { extensionReceiverParameterField.toPersistentField(+"null"), valueParametersField.toPersistentField(+"emptyList()"), bodyField.toBody(), + contextReceiverParametersCount, +"override var metadata: " + MetadataSource + "? = null", visibilityField.toPersistentField(+"visibility"), descriptor(ClassConstructorDescriptor), diff --git a/compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/Function.kt b/compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/Function.kt index 915c2decd0a..d05f8b4b941 100644 --- a/compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/Function.kt +++ b/compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/Function.kt @@ -57,6 +57,7 @@ internal fun PersistentIrGenerator.generateFunction() { typeParametersField.toPersistentField(+"emptyList()"), dispatchReceiverParameterField.toPersistentField(+"null"), extensionReceiverParameterField.toPersistentField(+"null"), + contextReceiverParametersCount, valueParametersField.toPersistentField(+"emptyList()"), bodyField.toBody(), +"override var metadata: " + MetadataSource + "? = null", diff --git a/compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/PersistentIrGenerator.kt b/compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/PersistentIrGenerator.kt index f4e696e730b..6a73f8b0e3a 100644 --- a/compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/PersistentIrGenerator.kt +++ b/compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/PersistentIrGenerator.kt @@ -219,6 +219,8 @@ internal object PersistentIrGenerator { val removedOn = +"override var removedOn: Int = Int.MAX_VALUE" val annotationsField = +"override var annotationsField: List<" + IrConstructorCall + "> = emptyList()" + val contextReceiverParametersCount = +"override var contextReceiverParametersCount: Int = 0" + val commonFields = lines( signature, id,