From 1f37795e08fc0a58bb18ae5b61740f7e772cbed1 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Thu, 10 Sep 2020 15:03:15 +0300 Subject: [PATCH] IR: make IrExpression.type mutable --- .../src/org/jetbrains/kotlin/ir/expressions/IrExpression.kt | 2 +- .../org/jetbrains/kotlin/ir/expressions/impl/IrBlockImpl.kt | 4 ++-- .../org/jetbrains/kotlin/ir/expressions/impl/IrBreakImpl.kt | 2 +- .../org/jetbrains/kotlin/ir/expressions/impl/IrCallImpl.kt | 2 +- .../kotlin/ir/expressions/impl/IrClassReferenceImpl.kt | 2 +- .../jetbrains/kotlin/ir/expressions/impl/IrCompositeImpl.kt | 2 +- .../org/jetbrains/kotlin/ir/expressions/impl/IrConstImpl.kt | 2 +- .../kotlin/ir/expressions/impl/IrConstructorCallImpl.kt | 2 +- .../jetbrains/kotlin/ir/expressions/impl/IrContinueImpl.kt | 2 +- .../ir/expressions/impl/IrDelegatingConstructorCallImpl.kt | 2 +- .../jetbrains/kotlin/ir/expressions/impl/IrDoWhileLoopImpl.kt | 2 +- .../ir/expressions/impl/IrDynamicMemberExpressionImpl.kt | 2 +- .../ir/expressions/impl/IrDynamicOperatorExpressionImpl.kt | 2 +- .../kotlin/ir/expressions/impl/IrEnumConstructorCallImpl.kt | 2 +- .../kotlin/ir/expressions/impl/IrErrorCallExpressionImpl.kt | 2 +- .../kotlin/ir/expressions/impl/IrErrorExpressionImpl.kt | 2 +- .../kotlin/ir/expressions/impl/IrFunctionExpressionImpl.kt | 2 +- .../kotlin/ir/expressions/impl/IrFunctionReferenceImpl.kt | 2 +- .../jetbrains/kotlin/ir/expressions/impl/IrGetClassImpl.kt | 2 +- .../kotlin/ir/expressions/impl/IrGetEnumValueImpl.kt | 2 +- .../jetbrains/kotlin/ir/expressions/impl/IrGetFieldImpl.kt | 2 +- .../kotlin/ir/expressions/impl/IrGetObjectValueImpl.kt | 2 +- .../jetbrains/kotlin/ir/expressions/impl/IrGetValueImpl.kt | 2 +- .../jetbrains/kotlin/ir/expressions/impl/IrIfThenElseImpl.kt | 2 +- .../ir/expressions/impl/IrInstanceInitializerCallImpl.kt | 2 +- .../expressions/impl/IrLocalDelegatedPropertyReferenceImpl.kt | 2 +- .../kotlin/ir/expressions/impl/IrPropertyReferenceImpl.kt | 2 +- .../kotlin/ir/expressions/impl/IrRawFunctionReferenceImpl.kt | 2 +- .../org/jetbrains/kotlin/ir/expressions/impl/IrReturnImpl.kt | 2 +- .../jetbrains/kotlin/ir/expressions/impl/IrSetFieldImpl.kt | 2 +- .../jetbrains/kotlin/ir/expressions/impl/IrSetVariableImpl.kt | 2 +- .../kotlin/ir/expressions/impl/IrStringConcatenationImpl.kt | 2 +- .../org/jetbrains/kotlin/ir/expressions/impl/IrSuspendImpl.kt | 4 ++-- .../org/jetbrains/kotlin/ir/expressions/impl/IrThrowImpl.kt | 2 +- .../src/org/jetbrains/kotlin/ir/expressions/impl/IrTryImpl.kt | 2 +- .../kotlin/ir/expressions/impl/IrTypeOperatorCallImpl.kt | 2 +- .../org/jetbrains/kotlin/ir/expressions/impl/IrVarargImpl.kt | 2 +- .../org/jetbrains/kotlin/ir/expressions/impl/IrWhenImpl.kt | 2 +- .../jetbrains/kotlin/ir/expressions/impl/IrWhileLoopImpl.kt | 2 +- 39 files changed, 41 insertions(+), 41 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrExpression.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrExpression.kt index 7edc0bb7cee..af934a864e2 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrExpression.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrExpression.kt @@ -27,7 +27,7 @@ abstract class IrExpression : IrElementBase(), IrStatement, IrVarargElement, IrA @Suppress("LeakingThis") override var attributeOwnerId: IrAttributeContainer = this - abstract val type: IrType + abstract var type: IrType override fun transform(transformer: IrElementTransformer, data: D): IrExpression = accept(transformer, data) as IrExpression diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrBlockImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrBlockImpl.kt index b1a4868299c..f887c5fc72c 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrBlockImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrBlockImpl.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrBlockImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val origin: IrStatementOrigin? = null, ) : IrBlock() { constructor( @@ -63,7 +63,7 @@ fun IrBlockImpl.inlineStatement(statement: IrStatement) { class IrReturnableBlockImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val symbol: IrReturnableBlockSymbol, override val origin: IrStatementOrigin? = null, override val inlineFunctionSymbol: IrFunctionSymbol? = null diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrBreakImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrBreakImpl.kt index a00a708b19d..95c9063b6e6 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrBreakImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrBreakImpl.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrBreakImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override var loop: IrLoop, ) : IrBreak() { override fun accept(visitor: IrElementVisitor, data: D): R = 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 b7fe16e2846..0aea7e2ab6d 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 @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrCallImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val symbol: IrSimpleFunctionSymbol, typeArgumentsCount: Int, valueArgumentsCount: Int, 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 b4f3341fcdc..c93fb41d092 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,7 +24,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrClassReferenceImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val symbol: IrClassifierSymbol, override val classType: IrType ) : IrClassReference() { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCompositeImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCompositeImpl.kt index bbe2c7dd3d3..f3253d69b3d 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCompositeImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCompositeImpl.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrCompositeImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val origin: IrStatementOrigin? = null, ) : IrComposite() { constructor( diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrConstImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrConstImpl.kt index 804394d553a..019443e5623 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrConstImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrConstImpl.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrConstImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val kind: IrConstKind, override val value: T ) : IrConst() { 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 5c053f30a9a..270a3ebbc5d 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 @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrConstructorCallImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val symbol: IrConstructorSymbol, typeArgumentsCount: Int, override val constructorTypeArgumentsCount: Int, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrContinueImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrContinueImpl.kt index f0cca35d6da..1d6d47353d5 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrContinueImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrContinueImpl.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrContinueImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override var loop: IrLoop, ) : IrContinue() { override fun accept(visitor: IrElementVisitor, data: D): R = 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 3736c692d38..8941f39cf5c 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 @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrDelegatingConstructorCallImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val symbol: IrConstructorSymbol, typeArgumentsCount: Int, valueArgumentsCount: Int diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDoWhileLoopImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDoWhileLoopImpl.kt index a17c16be797..97bcba62db9 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDoWhileLoopImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDoWhileLoopImpl.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrDoWhileLoopImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val origin: IrStatementOrigin?, ) : IrDoWhileLoop() { override fun accept(visitor: IrElementVisitor, data: D): R { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDynamicMemberExpressionImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDynamicMemberExpressionImpl.kt index 8c55ebbe0f1..65fec8717e8 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDynamicMemberExpressionImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDynamicMemberExpressionImpl.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrDynamicMemberExpressionImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val memberName: String, override var receiver: IrExpression ) : IrDynamicMemberExpression() { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDynamicOperatorExpressionImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDynamicOperatorExpressionImpl.kt index ba6b4198f86..6a7a81e9c63 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDynamicOperatorExpressionImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDynamicOperatorExpressionImpl.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.utils.SmartList class IrDynamicOperatorExpressionImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val operator: IrDynamicOperator ) : IrDynamicOperatorExpression() { override lateinit var receiver: IrExpression 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 6e40951c607..f5ad2bd72aa 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 @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrEnumConstructorCallImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val symbol: IrConstructorSymbol, typeArgumentsCount: Int, valueArgumentsCount: Int diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrErrorCallExpressionImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrErrorCallExpressionImpl.kt index 0b3917c9b32..4e26291dbf3 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrErrorCallExpressionImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrErrorCallExpressionImpl.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.utils.SmartList class IrErrorCallExpressionImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val description: String ) : IrErrorCallExpression() { override var explicitReceiver: IrExpression? = null diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrErrorExpressionImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrErrorExpressionImpl.kt index ef58a20fd4a..d161d55071c 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrErrorExpressionImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrErrorExpressionImpl.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrErrorExpressionImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val description: String ) : IrErrorExpression(), IrExpressionWithCopy { override fun accept(visitor: IrElementVisitor, data: D): R = diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrFunctionExpressionImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrFunctionExpressionImpl.kt index a1ac20bf7eb..4ee8a1e996a 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrFunctionExpressionImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrFunctionExpressionImpl.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrFunctionExpressionImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override var function: IrSimpleFunction, override val origin: IrStatementOrigin ) : IrFunctionExpression() { 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 fff87bb376c..22c0ff4b523 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 @@ import org.jetbrains.kotlin.name.Name class IrFunctionReferenceImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val symbol: IrFunctionSymbol, typeArgumentsCount: Int, override val valueArgumentsCount: Int, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetClassImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetClassImpl.kt index 98f17304365..46241528227 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetClassImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetClassImpl.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrGetClassImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override var argument: IrExpression, ) : IrGetClass() { override fun accept(visitor: IrElementVisitor, data: D): R { 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 0c345b02fe1..43536030561 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,7 +24,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrGetEnumValueImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val symbol: IrEnumEntrySymbol, ) : IrGetEnumValue() { override fun accept(visitor: IrElementVisitor, data: D): R { 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 043b0196734..8f8e6396211 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 @@ -29,7 +29,7 @@ class IrGetFieldImpl( override val startOffset: Int, override val endOffset: Int, override val symbol: IrFieldSymbol, - override val type: IrType, + override var type: IrType, override val origin: IrStatementOrigin? = null, override val superQualifierSymbol: IrClassSymbol? = null, ) : IrGetField() { 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 9d3c1622959..5393fe3eb0b 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,7 +24,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrGetObjectValueImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val symbol: IrClassSymbol ) : IrGetObjectValue() { override fun accept(visitor: IrElementVisitor, data: D): R = 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 5e5a6ee05d8..775869939c0 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 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrGetValueImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val symbol: IrValueSymbol, override val origin: IrStatementOrigin? = null ) : IrGetValue() { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrIfThenElseImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrIfThenElseImpl.kt index 6904875fb6c..d895170519b 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrIfThenElseImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrIfThenElseImpl.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.utils.SmartList class IrIfThenElseImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val origin: IrStatementOrigin? = null ) : IrWhen() { override val branches: MutableList = SmartList() diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrInstanceInitializerCallImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrInstanceInitializerCallImpl.kt index f0dbf5d0db1..504e6b00a7f 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrInstanceInitializerCallImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrInstanceInitializerCallImpl.kt @@ -25,7 +25,7 @@ class IrInstanceInitializerCallImpl( override val startOffset: Int, override val endOffset: Int, override val classSymbol: IrClassSymbol, - override val type: IrType, + override var type: IrType, ) : IrInstanceInitializerCall() { override fun accept(visitor: IrElementVisitor, data: D): R { return visitor.visitInstanceInitializerCall(this, data) 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 55bebf19db0..bf550554bdb 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 @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.name.Name class IrLocalDelegatedPropertyReferenceImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val symbol: IrLocalDelegatedPropertySymbol, override val delegate: IrVariableSymbol, override val getter: 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 790b148bc94..4b5ec9c31c4 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 @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.name.Name class IrPropertyReferenceImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val symbol: IrPropertySymbol, typeArgumentsCount: Int, override val field: IrFieldSymbol?, 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 598f9c4703e..4b28c974caf 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,7 +24,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrRawFunctionReferenceImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val symbol: IrFunctionSymbol, ) : IrRawFunctionReference() { override fun accept(visitor: IrElementVisitor, data: D): R { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrReturnImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrReturnImpl.kt index 4a153c1a2ec..7236533e18c 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrReturnImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrReturnImpl.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrReturnImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val returnTargetSymbol: IrReturnTargetSymbol, override var value: IrExpression ) : IrReturn() { 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 5dc25f748aa..45341d65039 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 @@ -29,7 +29,7 @@ class IrSetFieldImpl( override val startOffset: Int, override val endOffset: Int, override val symbol: IrFieldSymbol, - override val type: IrType, + override var type: IrType, override val origin: IrStatementOrigin? = null, override val superQualifierSymbol: IrClassSymbol? = null, ) : IrSetField() { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSetVariableImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSetVariableImpl.kt index 7d86ba6d7cf..610ae699c3e 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSetVariableImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSetVariableImpl.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrSetVariableImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val symbol: IrVariableSymbol, override var value: IrExpression, override val origin: IrStatementOrigin? diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrStringConcatenationImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrStringConcatenationImpl.kt index 4e18b2c4a34..df79b3e24de 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrStringConcatenationImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrStringConcatenationImpl.kt @@ -26,7 +26,7 @@ import java.util.* class IrStringConcatenationImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType + override var type: IrType ) : IrStringConcatenation() { constructor( startOffset: Int, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSuspendImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSuspendImpl.kt index 35c9f81c758..c796fc60cda 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSuspendImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSuspendImpl.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrSuspensionPointImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override var suspensionPointIdParameter: IrVariable, override var result: IrExpression, override var resumeResult: IrExpression @@ -40,7 +40,7 @@ class IrSuspensionPointImpl( class IrSuspendableExpressionImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override var suspensionPointId: IrExpression, override var result: IrExpression ) : IrSuspendableExpression() { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrThrowImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrThrowImpl.kt index 74db5c0d76b..2d76c4a33cc 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrThrowImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrThrowImpl.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrThrowImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override var value: IrExpression, ) : IrThrow() { override fun accept(visitor: IrElementVisitor, data: D): R = diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrTryImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrTryImpl.kt index 2e5c6888c6a..d0f341911fb 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrTryImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrTryImpl.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.utils.SmartList class IrTryImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, ) : IrTry() { constructor( startOffset: Int, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrTypeOperatorCallImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrTypeOperatorCallImpl.kt index d673a100fec..624632301fd 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrTypeOperatorCallImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrTypeOperatorCallImpl.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrTypeOperatorCallImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val operator: IrTypeOperator, override val typeOperand: IrType, override var argument: IrExpression, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrVarargImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrVarargImpl.kt index bf2fb94190e..cee9e04d600 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrVarargImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrVarargImpl.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.utils.SmartList class IrVarargImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val varargElementType: IrType ) : IrVararg() { constructor( diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrWhenImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrWhenImpl.kt index c53cdbc70c3..bc82595ec19 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrWhenImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrWhenImpl.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrWhenImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val origin: IrStatementOrigin? = null ) : IrWhen() { constructor( diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrWhileLoopImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrWhileLoopImpl.kt index cc6ca876e68..0bb540e5810 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrWhileLoopImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrWhileLoopImpl.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor class IrWhileLoopImpl( override val startOffset: Int, override val endOffset: Int, - override val type: IrType, + override var type: IrType, override val origin: IrStatementOrigin?, ) : IrWhileLoop() { override fun accept(visitor: IrElementVisitor, data: D): R {