diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt index c253af4f438..c812084cf7c 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt @@ -881,7 +881,7 @@ class FunctionInlining( } private class IrGetValueWithoutLocation( - override val symbol: IrValueSymbol, + override var symbol: IrValueSymbol, override var origin: IrStatementOrigin? = null ) : IrGetValue() { override val startOffset: Int get() = UNDEFINED_OFFSET diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrCall.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrCall.kt index 2f5861a170f..1d2bf40d15d 100644 --- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrCall.kt +++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrCall.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor * Generated from: [org.jetbrains.kotlin.ir.generator.IrTree.call] */ abstract class IrCall : IrFunctionAccessExpression() { - abstract override val symbol: IrSimpleFunctionSymbol + abstract override var symbol: IrSimpleFunctionSymbol abstract var superQualifierSymbol: IrClassSymbol? diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrCallableReference.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrCallableReference.kt index 8c094f385d6..531b2363bad 100644 --- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrCallableReference.kt +++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrCallableReference.kt @@ -15,4 +15,6 @@ import org.jetbrains.kotlin.ir.symbols.IrSymbol * * Generated from: [org.jetbrains.kotlin.ir.generator.IrTree.callableReference] */ -abstract class IrCallableReference : IrMemberAccessExpression() +abstract class IrCallableReference : IrMemberAccessExpression() { + abstract override var symbol: S +} diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrClassReference.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrClassReference.kt index 45848eaf0c7..8a898954fee 100644 --- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrClassReference.kt +++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrClassReference.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor * Generated from: [org.jetbrains.kotlin.ir.generator.IrTree.classReference] */ abstract class IrClassReference : IrDeclarationReference() { - abstract override val symbol: IrClassifierSymbol + abstract override var symbol: IrClassifierSymbol abstract var classType: IrType diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrConstructorCall.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrConstructorCall.kt index 9648d04052e..fc7cf879e89 100644 --- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrConstructorCall.kt +++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrConstructorCall.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor * Generated from: [org.jetbrains.kotlin.ir.generator.IrTree.constructorCall] */ abstract class IrConstructorCall : IrFunctionAccessExpression() { - abstract override val symbol: IrConstructorSymbol + abstract override var symbol: IrConstructorSymbol abstract var source: SourceElement diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrDelegatingConstructorCall.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrDelegatingConstructorCall.kt index bdafefb6242..b6bd1e7729d 100644 --- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrDelegatingConstructorCall.kt +++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrDelegatingConstructorCall.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor * Generated from: [org.jetbrains.kotlin.ir.generator.IrTree.delegatingConstructorCall] */ abstract class IrDelegatingConstructorCall : IrFunctionAccessExpression() { - abstract override val symbol: IrConstructorSymbol + abstract override var symbol: IrConstructorSymbol override fun accept(visitor: IrElementVisitor, data: D): R = visitor.visitDelegatingConstructorCall(this, data) diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrEnumConstructorCall.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrEnumConstructorCall.kt index db09f949d9a..c134df2d134 100644 --- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrEnumConstructorCall.kt +++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrEnumConstructorCall.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor * Generated from: [org.jetbrains.kotlin.ir.generator.IrTree.enumConstructorCall] */ abstract class IrEnumConstructorCall : IrFunctionAccessExpression() { - abstract override val symbol: IrConstructorSymbol + abstract override var symbol: IrConstructorSymbol override fun accept(visitor: IrElementVisitor, data: D): R = visitor.visitEnumConstructorCall(this, data) diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrFieldAccessExpression.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrFieldAccessExpression.kt index b835a320926..dd19e59738f 100644 --- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrFieldAccessExpression.kt +++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrFieldAccessExpression.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.ir.symbols.IrFieldSymbol * Generated from: [org.jetbrains.kotlin.ir.generator.IrTree.fieldAccessExpression] */ abstract class IrFieldAccessExpression : IrDeclarationReference() { - abstract override val symbol: IrFieldSymbol + abstract override var symbol: IrFieldSymbol abstract var superQualifierSymbol: IrClassSymbol? diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrGetEnumValue.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrGetEnumValue.kt index 04e10f64822..4115cf5b104 100644 --- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrGetEnumValue.kt +++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrGetEnumValue.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor * Generated from: [org.jetbrains.kotlin.ir.generator.IrTree.getEnumValue] */ abstract class IrGetEnumValue : IrGetSingletonValue() { - abstract override val symbol: IrEnumEntrySymbol + abstract override var symbol: IrEnumEntrySymbol override fun accept(visitor: IrElementVisitor, data: D): R = visitor.visitGetEnumValue(this, data) diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrGetObjectValue.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrGetObjectValue.kt index f87d43cbed6..eee7c8cc6c8 100644 --- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrGetObjectValue.kt +++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrGetObjectValue.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor * Generated from: [org.jetbrains.kotlin.ir.generator.IrTree.getObjectValue] */ abstract class IrGetObjectValue : IrGetSingletonValue() { - abstract override val symbol: IrClassSymbol + abstract override var symbol: IrClassSymbol override fun accept(visitor: IrElementVisitor, data: D): R = visitor.visitGetObjectValue(this, data) diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrRawFunctionReference.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrRawFunctionReference.kt index 9bfc9ad81bb..994a024ffb6 100644 --- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrRawFunctionReference.kt +++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrRawFunctionReference.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor * Generated from: [org.jetbrains.kotlin.ir.generator.IrTree.rawFunctionReference] */ abstract class IrRawFunctionReference : IrDeclarationReference() { - abstract override val symbol: IrFunctionSymbol + abstract override var symbol: IrFunctionSymbol override fun accept(visitor: IrElementVisitor, data: D): R = visitor.visitRawFunctionReference(this, data) diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrValueAccessExpression.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrValueAccessExpression.kt index a4622e818fe..628231597a9 100644 --- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrValueAccessExpression.kt +++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrValueAccessExpression.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.ir.symbols.IrValueSymbol * Generated from: [org.jetbrains.kotlin.ir.generator.IrTree.valueAccessExpression] */ abstract class IrValueAccessExpression : IrDeclarationReference() { - abstract override val symbol: IrValueSymbol + abstract override var symbol: IrValueSymbol abstract var origin: IrStatementOrigin? } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCallImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCallImpl.kt index f3d9e7b8579..92eb461cb2c 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCallImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCallImpl.kt @@ -33,7 +33,7 @@ class IrCallImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, - override val symbol: IrSimpleFunctionSymbol, + override var symbol: IrSimpleFunctionSymbol, typeArgumentsCount: Int, valueArgumentsCount: Int, override var origin: IrStatementOrigin? = null, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrClassReferenceImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrClassReferenceImpl.kt index cc93ed04bed..8d4036efb96 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrClassReferenceImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrClassReferenceImpl.kt @@ -24,6 +24,6 @@ class IrClassReferenceImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, - override val symbol: IrClassifierSymbol, + override var symbol: IrClassifierSymbol, override var classType: IrType ) : IrClassReference() diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrConstructorCallImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrConstructorCallImpl.kt index 8d79bd14bf5..ee0acbc3756 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrConstructorCallImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrConstructorCallImpl.kt @@ -21,7 +21,7 @@ class IrConstructorCallImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, - override val symbol: IrConstructorSymbol, + override var symbol: IrConstructorSymbol, typeArgumentsCount: Int, override var constructorTypeArgumentsCount: Int, valueArgumentsCount: Int, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDelegatingConstructorCallImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDelegatingConstructorCallImpl.kt index be1f0b2fc18..271c52ecd69 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDelegatingConstructorCallImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDelegatingConstructorCallImpl.kt @@ -31,7 +31,7 @@ class IrDelegatingConstructorCallImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, - override val symbol: IrConstructorSymbol, + override var symbol: IrConstructorSymbol, typeArgumentsCount: Int, valueArgumentsCount: Int, ) : IrDelegatingConstructorCall() { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrEnumConstructorCallImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrEnumConstructorCallImpl.kt index b37a2df7c19..4eca8c43145 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrEnumConstructorCallImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrEnumConstructorCallImpl.kt @@ -29,7 +29,7 @@ class IrEnumConstructorCallImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, - override val symbol: IrConstructorSymbol, + override var symbol: IrConstructorSymbol, typeArgumentsCount: Int, valueArgumentsCount: Int ) : IrEnumConstructorCall() { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrFunctionReferenceImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrFunctionReferenceImpl.kt index fea6daf53ee..25c8cacd25e 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrFunctionReferenceImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrFunctionReferenceImpl.kt @@ -29,7 +29,7 @@ class IrFunctionReferenceImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, - override val symbol: IrFunctionSymbol, + override var symbol: IrFunctionSymbol, typeArgumentsCount: Int, valueArgumentsCount: Int, override var reflectionTarget: IrFunctionSymbol? = symbol, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetEnumValueImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetEnumValueImpl.kt index 3c8918c26aa..159be203505 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetEnumValueImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetEnumValueImpl.kt @@ -24,5 +24,5 @@ class IrGetEnumValueImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, - override val symbol: IrEnumEntrySymbol, + override var symbol: IrEnumEntrySymbol, ) : IrGetEnumValue() diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetFieldImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetFieldImpl.kt index c6672cd91f3..b76f2c4dc78 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetFieldImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetFieldImpl.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.ir.types.IrType class IrGetFieldImpl( override val startOffset: Int, override val endOffset: Int, - override val symbol: IrFieldSymbol, + override var symbol: IrFieldSymbol, override var type: IrType, override var origin: IrStatementOrigin? = null, override var superQualifierSymbol: IrClassSymbol? = null, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetObjectValueImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetObjectValueImpl.kt index df7385396b6..dcce2e06f32 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetObjectValueImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetObjectValueImpl.kt @@ -24,5 +24,5 @@ class IrGetObjectValueImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, - override val symbol: IrClassSymbol + override var symbol: IrClassSymbol ) : IrGetObjectValue() diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetValueImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetValueImpl.kt index 3cb4d9fe2c1..7f2eb6d43e2 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetValueImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetValueImpl.kt @@ -14,7 +14,7 @@ class IrGetValueImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, - override val symbol: IrValueSymbol, + override var symbol: IrValueSymbol, override var origin: IrStatementOrigin? = null ) : IrGetValue() { constructor( diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrLocalDelegatedPropertyReferenceImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrLocalDelegatedPropertyReferenceImpl.kt index 7314a728bf6..d66bc9a599a 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrLocalDelegatedPropertyReferenceImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrLocalDelegatedPropertyReferenceImpl.kt @@ -30,7 +30,7 @@ class IrLocalDelegatedPropertyReferenceImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, - override val symbol: IrLocalDelegatedPropertySymbol, + override var symbol: IrLocalDelegatedPropertySymbol, override var delegate: IrVariableSymbol, override var getter: IrSimpleFunctionSymbol, override var setter: IrSimpleFunctionSymbol?, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrPropertyReferenceImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrPropertyReferenceImpl.kt index 6208aff3fad..b1092d6be88 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrPropertyReferenceImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrPropertyReferenceImpl.kt @@ -30,7 +30,7 @@ class IrPropertyReferenceImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, - override val symbol: IrPropertySymbol, + override var symbol: IrPropertySymbol, typeArgumentsCount: Int, override var field: IrFieldSymbol?, override var getter: IrSimpleFunctionSymbol?, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrRawFunctionReferenceImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrRawFunctionReferenceImpl.kt index 70f71679afa..2ab930649a7 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrRawFunctionReferenceImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrRawFunctionReferenceImpl.kt @@ -24,5 +24,5 @@ class IrRawFunctionReferenceImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, - override val symbol: IrFunctionSymbol, + override var symbol: IrFunctionSymbol, ) : IrRawFunctionReference() diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSetFieldImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSetFieldImpl.kt index ab797f7cce5..5b960ca0bf5 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSetFieldImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSetFieldImpl.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.ir.types.IrType class IrSetFieldImpl( override val startOffset: Int, override val endOffset: Int, - override val symbol: IrFieldSymbol, + override var symbol: IrFieldSymbol, override var type: IrType, override var origin: IrStatementOrigin? = null, override var superQualifierSymbol: IrClassSymbol? = null, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSetValueImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSetValueImpl.kt index 5bf48b4eaff..49d026a1c6a 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSetValueImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSetValueImpl.kt @@ -26,7 +26,7 @@ class IrSetValueImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, - override val symbol: IrValueSymbol, + override var symbol: IrValueSymbol, override var value: IrExpression, override var origin: IrStatementOrigin? ) : IrSetValue() { diff --git a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/IrTree.kt b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/IrTree.kt index a7a4822b315..a65d1df48a5 100644 --- a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/IrTree.kt +++ b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/IrTree.kt @@ -31,8 +31,9 @@ import org.jetbrains.kotlin.types.Variance // 2) parents // 3) fields object IrTree : AbstractTreeBuilder() { - private fun symbol(type: TypeRef) = field("symbol", type, mutable = false) - private fun descriptor(typeName: String) = + private fun symbol(type: TypeRef, mutable: Boolean = false): SimpleFieldConfig = + field("symbol", type, mutable = mutable) + private fun descriptor(typeName: String): SimpleFieldConfig = field("descriptor", ClassRef(TypeKind.Interface, "org.jetbrains.kotlin.descriptors", typeName), mutable = false) private val factory: SimpleFieldConfig = field("factory", type(Packages.declarations, "IrFactory"), mutable = false) @@ -716,7 +717,7 @@ object IrTree : AbstractTreeBuilder() { parent(functionAccessExpression) - +symbol(constructorSymbolType) + +symbol(constructorSymbolType, mutable = true) +field("source", type()) +field("constructorTypeArgumentsCount", int) } @@ -731,14 +732,14 @@ object IrTree : AbstractTreeBuilder() { parent(getSingletonValue) - +symbol(classSymbolType) + +symbol(classSymbolType, mutable = true) } val getEnumValue: ElementConfig by element(Expression) { visitorParent = getSingletonValue parent(getSingletonValue) - +symbol(enumEntrySymbolType) + +symbol(enumEntrySymbolType, mutable = true) } /** @@ -752,7 +753,7 @@ object IrTree : AbstractTreeBuilder() { parent(declarationReference) - +symbol(functionSymbolType) + +symbol(functionSymbolType, mutable = true) } val containerExpression: ElementConfig by element(Expression) { visitorParent = expression @@ -828,7 +829,7 @@ object IrTree : AbstractTreeBuilder() { parent(functionAccessExpression) - +symbol(simpleFunctionSymbolType) + +symbol(simpleFunctionSymbolType, mutable = true) +field("superQualifierSymbol", classSymbolType, nullable = true) } val callableReference: ElementConfig by element(Expression) { @@ -836,6 +837,8 @@ object IrTree : AbstractTreeBuilder() { val s = +param("S", symbolType) parent(memberAccessExpression.withArgs("S" to s)) + + +symbol(s, mutable = true) } val functionReference: ElementConfig by element(Expression) { visitorParent = callableReference @@ -867,7 +870,7 @@ object IrTree : AbstractTreeBuilder() { parent(declarationReference) - +symbol(classifierSymbolType) + +symbol(classifierSymbolType, mutable = true) +field("classType", irTypeType) } val const: ElementConfig by element(Expression) { @@ -929,7 +932,7 @@ object IrTree : AbstractTreeBuilder() { parent(functionAccessExpression) - +symbol(constructorSymbolType) + +symbol(constructorSymbolType, mutable = true) } val dynamicExpression: ElementConfig by element(Expression) { visitorParent = expression @@ -958,7 +961,7 @@ object IrTree : AbstractTreeBuilder() { parent(functionAccessExpression) - +symbol(constructorSymbolType) + +symbol(constructorSymbolType, mutable = true) } val errorExpression: ElementConfig by element(Expression) { visitorParent = expression @@ -983,7 +986,7 @@ object IrTree : AbstractTreeBuilder() { parent(declarationReference) - +symbol(fieldSymbolType) + +symbol(fieldSymbolType, mutable = true) +field("superQualifierSymbol", classSymbolType, nullable = true) +field("receiver", expression, nullable = true, isChild = true) { baseDefaultValue = code("null") @@ -1128,7 +1131,7 @@ object IrTree : AbstractTreeBuilder() { parent(declarationReference) - +symbol(valueSymbolType) + +symbol(valueSymbolType, mutable = true) +field("origin", statementOriginType, nullable = true) } val getValue: ElementConfig by element(Expression) {