diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt index e26a54ce096..2f184aceeff 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt @@ -25,22 +25,22 @@ import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.name.Name class IrClassImpl( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val symbol: IrClassSymbol, - override val name: Name, - override val kind: ClassKind, - override var visibility: DescriptorVisibility, - override var modality: Modality, - override val isCompanion: Boolean = false, - override val isInner: Boolean = false, - override val isData: Boolean = false, - override val isExternal: Boolean = false, - override val isInline: Boolean = false, - override val isExpect: Boolean = false, - override val isFun: Boolean = false, - override val source: SourceElement = SourceElement.NO_SOURCE + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val symbol: IrClassSymbol, + override val name: Name, + override val kind: ClassKind, + override var visibility: DescriptorVisibility, + override var modality: Modality, + override val isCompanion: Boolean = false, + override val isInner: Boolean = false, + override val isData: Boolean = false, + override val isExternal: Boolean = false, + override val isInline: Boolean = false, + override val isExpect: Boolean = false, + override val isFun: Boolean = false, + override val source: SourceElement = SourceElement.NO_SOURCE ) : IrClass() { init { symbol.bind(this) diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt index e07e50f7e24..badbdeff902 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt @@ -29,18 +29,18 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource class IrConstructorImpl( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val symbol: IrConstructorSymbol, - override val name: Name, - override var visibility: DescriptorVisibility, - returnType: IrType, - override val isInline: Boolean, - override val isExternal: Boolean, - override val isPrimary: Boolean, - override val isExpect: Boolean, - override val containerSource: DeserializedContainerSource? = null, + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val symbol: IrConstructorSymbol, + override val name: Name, + override var visibility: DescriptorVisibility, + returnType: IrType, + override val isInline: Boolean, + override val isExternal: Boolean, + override val isPrimary: Boolean, + override val isExpect: Boolean, + override val containerSource: DeserializedContainerSource? = null, ) : IrConstructor() { init { symbol.bind(this) diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt index b4ee1b90fc8..e069cd8a68b 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt @@ -30,22 +30,22 @@ object IrFactoryImpl : IrFactory { IrAnonymousInitializerImpl(startOffset, endOffset, origin, symbol, isStatic) override fun createClass( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrClassSymbol, - name: Name, - kind: ClassKind, - visibility: DescriptorVisibility, - modality: Modality, - isCompanion: Boolean, - isInner: Boolean, - isData: Boolean, - isExternal: Boolean, - isInline: Boolean, - isExpect: Boolean, - isFun: Boolean, - source: SourceElement, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrClassSymbol, + name: Name, + kind: ClassKind, + visibility: DescriptorVisibility, + modality: Modality, + isCompanion: Boolean, + isInner: Boolean, + isData: Boolean, + isExternal: Boolean, + isInline: Boolean, + isExpect: Boolean, + isFun: Boolean, + source: SourceElement, ): IrClass = IrClassImpl( startOffset, endOffset, origin, symbol, name, kind, visibility, modality, @@ -53,18 +53,18 @@ object IrFactoryImpl : IrFactory { ) override fun createConstructor( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrConstructorSymbol, - name: Name, - visibility: DescriptorVisibility, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isPrimary: Boolean, - isExpect: Boolean, - containerSource: DeserializedContainerSource?, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrConstructorSymbol, + name: Name, + visibility: DescriptorVisibility, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isPrimary: Boolean, + isExpect: Boolean, + containerSource: DeserializedContainerSource?, ): IrConstructor = IrConstructorImpl( startOffset, endOffset, origin, symbol, name, visibility, returnType, isInline, isExternal, isPrimary, isExpect, @@ -88,37 +88,37 @@ object IrFactoryImpl : IrFactory { IrErrorDeclarationImpl(startOffset, endOffset, descriptor) override fun createField( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrFieldSymbol, - name: Name, - type: IrType, - visibility: DescriptorVisibility, - isFinal: Boolean, - isExternal: Boolean, - isStatic: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrFieldSymbol, + name: Name, + type: IrType, + visibility: DescriptorVisibility, + isFinal: Boolean, + isExternal: Boolean, + isStatic: Boolean, ): IrField = IrFieldImpl(startOffset, endOffset, origin, symbol, name, type, visibility, isFinal, isExternal, isStatic) override fun createFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrSimpleFunctionSymbol, - name: Name, - visibility: DescriptorVisibility, - modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, - isFakeOverride: Boolean, - containerSource: DeserializedContainerSource?, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrSimpleFunctionSymbol, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, + isFakeOverride: Boolean, + containerSource: DeserializedContainerSource?, ): IrSimpleFunction = IrFunctionImpl( startOffset, endOffset, origin, symbol, name, visibility, modality, returnType, @@ -127,20 +127,20 @@ object IrFactoryImpl : IrFactory { ) override fun createFakeOverrideFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: DescriptorVisibility, - modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, ): IrSimpleFunction = IrFakeOverrideFunctionImpl( startOffset, endOffset, origin, name, visibility, modality, returnType, @@ -159,21 +159,21 @@ object IrFactoryImpl : IrFactory { IrLocalDelegatedPropertyImpl(startOffset, endOffset, origin, symbol, name, type, isVar) override fun createProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrPropertySymbol, - name: Name, - visibility: DescriptorVisibility, - modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean, - isFakeOverride: Boolean, - containerSource: DeserializedContainerSource?, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrPropertySymbol, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean, + isFakeOverride: Boolean, + containerSource: DeserializedContainerSource?, ): IrProperty = IrPropertyImpl( startOffset, endOffset, origin, symbol, name, visibility, modality, @@ -182,18 +182,18 @@ object IrFactoryImpl : IrFactory { ) override fun createFakeOverrideProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: DescriptorVisibility, - modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean, ): IrProperty = IrFakeOverridePropertyImpl( startOffset, endOffset, origin, name, visibility, modality, @@ -201,14 +201,14 @@ object IrFactoryImpl : IrFactory { ) override fun createTypeAlias( - startOffset: Int, - endOffset: Int, - symbol: IrTypeAliasSymbol, - name: Name, - visibility: DescriptorVisibility, - expandedType: IrType, - isActual: Boolean, - origin: IrDeclarationOrigin, + startOffset: Int, + endOffset: Int, + symbol: IrTypeAliasSymbol, + name: Name, + visibility: DescriptorVisibility, + expandedType: IrType, + isActual: Boolean, + origin: IrDeclarationOrigin, ): IrTypeAlias = IrTypeAliasImpl(startOffset, endOffset, symbol, name, visibility, expandedType, isActual, origin) @@ -237,7 +237,9 @@ object IrFactoryImpl : IrFactory { isNoinline: Boolean, isHidden: Boolean ): IrValueParameter = - IrValueParameterImpl(startOffset, endOffset, origin, symbol, name, index, type, varargElementType, isCrossinline, isNoinline, isHidden) + IrValueParameterImpl( + startOffset, endOffset, origin, symbol, name, index, type, varargElementType, isCrossinline, isNoinline, isHidden + ) override fun createExpressionBody( startOffset: Int, diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt index e4dea615c3e..c9602b4c5cf 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt @@ -28,16 +28,16 @@ import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.name.Name class IrFieldImpl( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val symbol: IrFieldSymbol, - override val name: Name, - override var type: IrType, - override var visibility: DescriptorVisibility, - override val isFinal: Boolean, - override val isExternal: Boolean, - override val isStatic: Boolean, + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val symbol: IrFieldSymbol, + override val name: Name, + override var type: IrType, + override var visibility: DescriptorVisibility, + override val isFinal: Boolean, + override val isExternal: Boolean, + override val isStatic: Boolean, ) : IrField() { init { symbol.bind(this) diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt index d137ea0ffb0..5deea0813bf 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt @@ -21,20 +21,20 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource abstract class IrFunctionCommonImpl( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val name: Name, - override var visibility: DescriptorVisibility, - returnType: IrType, - override val isInline: Boolean, - override val isExternal: Boolean, - override val isTailrec: Boolean, - override val isSuspend: Boolean, - override val isOperator: Boolean, - override val isInfix: Boolean, - override val isExpect: Boolean, - override val containerSource: DeserializedContainerSource?, + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val name: Name, + override var visibility: DescriptorVisibility, + returnType: IrType, + override val isInline: Boolean, + override val isExternal: Boolean, + override val isTailrec: Boolean, + override val isSuspend: Boolean, + override val isOperator: Boolean, + override val isInfix: Boolean, + override val isExpect: Boolean, + override val containerSource: DeserializedContainerSource?, ) : IrSimpleFunction() { override val factory: IrFactory get() = IrFactoryImpl @@ -68,23 +68,23 @@ abstract class IrFunctionCommonImpl( } class IrFunctionImpl( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - override val symbol: IrSimpleFunctionSymbol, - name: Name, - visibility: DescriptorVisibility, - override val modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, - override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, - containerSource: DeserializedContainerSource? = null, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + override val symbol: IrSimpleFunctionSymbol, + name: Name, + visibility: DescriptorVisibility, + override val modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, + override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, + containerSource: DeserializedContainerSource? = null, ) : IrFunctionCommonImpl( startOffset, endOffset, origin, name, visibility, returnType, isInline, isExternal, isTailrec, isSuspend, isOperator, isInfix, isExpect, @@ -100,20 +100,20 @@ class IrFunctionImpl( } class IrFakeOverrideFunctionImpl( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - override var visibility: DescriptorVisibility, - override var modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + override var visibility: DescriptorVisibility, + override var modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, ) : IrFunctionCommonImpl( startOffset, endOffset, origin, name, visibility, returnType, isInline, isExternal, isTailrec, isSuspend, isOperator, isInfix, isExpect, diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt index bd9177839b8..17725e92fe7 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt @@ -28,18 +28,18 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource abstract class IrPropertyCommonImpl( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val name: Name, - override var visibility: DescriptorVisibility, - override val isVar: Boolean, - override val isConst: Boolean, - override val isLateinit: Boolean, - override val isDelegated: Boolean, - override val isExternal: Boolean, - override val isExpect: Boolean, - override val containerSource: DeserializedContainerSource?, + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val name: Name, + override var visibility: DescriptorVisibility, + override val isVar: Boolean, + override val isConst: Boolean, + override val isLateinit: Boolean, + override val isDelegated: Boolean, + override val isExternal: Boolean, + override val isExpect: Boolean, + override val containerSource: DeserializedContainerSource?, ) : IrProperty() { override val factory: IrFactory get() = IrFactoryImpl @@ -59,21 +59,21 @@ abstract class IrPropertyCommonImpl( } class IrPropertyImpl( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - override val symbol: IrPropertySymbol, - name: Name, - visibility: DescriptorVisibility, - override val modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean = false, - override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, - containerSource: DeserializedContainerSource? = null, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + override val symbol: IrPropertySymbol, + name: Name, + visibility: DescriptorVisibility, + override val modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean = false, + override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, + containerSource: DeserializedContainerSource? = null, ) : IrPropertyCommonImpl( startOffset, endOffset, origin, name, visibility, isVar, isConst, isLateinit, isDelegated, isExternal, isExpect, containerSource @@ -88,18 +88,18 @@ class IrPropertyImpl( } class IrFakeOverridePropertyImpl( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: DescriptorVisibility, - override var modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + override var modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean, ) : IrPropertyCommonImpl( startOffset, endOffset, origin, name, visibility, isVar, isConst, isLateinit, isDelegated, isExternal, isExpect, containerSource = null, diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeAliasImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeAliasImpl.kt index 4e849a67fe3..f22915e18d2 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeAliasImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeAliasImpl.kt @@ -15,14 +15,14 @@ import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.name.Name class IrTypeAliasImpl( - override val startOffset: Int, - override val endOffset: Int, - override val symbol: IrTypeAliasSymbol, - override val name: Name, - override var visibility: DescriptorVisibility, - override var expandedType: IrType, - override val isActual: Boolean, - override var origin: IrDeclarationOrigin + override val startOffset: Int, + override val endOffset: Int, + override val symbol: IrTypeAliasSymbol, + override val name: Name, + override var visibility: DescriptorVisibility, + override var expandedType: IrType, + override val isActual: Boolean, + override var origin: IrDeclarationOrigin ) : IrTypeAlias() { init { symbol.bind(this) diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeParameterImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeParameterImpl.kt index b716c6c27c1..c74eab49656 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeParameterImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeParameterImpl.kt @@ -18,16 +18,15 @@ package org.jetbrains.kotlin.ir.declarations.impl import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI -import org.jetbrains.kotlin.ir.declarations.IrFactory import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent +import org.jetbrains.kotlin.ir.declarations.IrFactory import org.jetbrains.kotlin.ir.declarations.IrTypeParameter import org.jetbrains.kotlin.ir.expressions.IrConstructorCall import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.types.Variance -import org.jetbrains.kotlin.utils.SmartList class IrTypeParameterImpl( override val startOffset: Int, diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrClass.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrClass.kt index e2ee3e38501..5d249d1a231 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrClass.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrClass.kt @@ -28,22 +28,22 @@ import org.jetbrains.kotlin.name.Name import java.util.* internal class PersistentIrClass( - override val startOffset: Int, - override val endOffset: Int, - origin: IrDeclarationOrigin, - override val symbol: IrClassSymbol, - override val name: Name, - override val kind: ClassKind, - visibility: DescriptorVisibility, - modality: Modality, - override val isCompanion: Boolean = false, - override val isInner: Boolean = false, - override val isData: Boolean = false, - override val isExternal: Boolean = false, - override val isInline: Boolean = false, - override val isExpect: Boolean = false, - override val isFun: Boolean = false, - override val source: SourceElement = SourceElement.NO_SOURCE + override val startOffset: Int, + override val endOffset: Int, + origin: IrDeclarationOrigin, + override val symbol: IrClassSymbol, + override val name: Name, + override val kind: ClassKind, + visibility: DescriptorVisibility, + modality: Modality, + override val isCompanion: Boolean = false, + override val isInner: Boolean = false, + override val isData: Boolean = false, + override val isExternal: Boolean = false, + override val isInline: Boolean = false, + override val isExpect: Boolean = false, + override val isFun: Boolean = false, + override val source: SourceElement = SourceElement.NO_SOURCE ) : IrClass(), PersistentIrDeclarationBase, ClassCarrier { diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrConstructor.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrConstructor.kt index 7628793feb3..e9bd4d68f66 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrConstructor.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrConstructor.kt @@ -31,18 +31,18 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource internal class PersistentIrConstructor( - override val startOffset: Int, - override val endOffset: Int, - origin: IrDeclarationOrigin, - override val symbol: IrConstructorSymbol, - override val name: Name, - visibility: DescriptorVisibility, - returnType: IrType, - override val isInline: Boolean, - override val isExternal: Boolean, - override val isPrimary: Boolean, - override val isExpect: Boolean, - override val containerSource: DeserializedContainerSource? + override val startOffset: Int, + override val endOffset: Int, + origin: IrDeclarationOrigin, + override val symbol: IrConstructorSymbol, + override val name: Name, + visibility: DescriptorVisibility, + returnType: IrType, + override val isInline: Boolean, + override val isExternal: Boolean, + override val isPrimary: Boolean, + override val isExpect: Boolean, + override val containerSource: DeserializedContainerSource? ) : IrConstructor(), PersistentIrDeclarationBase, ConstructorCarrier { diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFactory.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFactory.kt index 76550a267af..64cbff6a1a6 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFactory.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFactory.kt @@ -30,22 +30,22 @@ object PersistentIrFactory : IrFactory { PersistentIrAnonymousInitializer(startOffset, endOffset, origin, symbol, isStatic) override fun createClass( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrClassSymbol, - name: Name, - kind: ClassKind, - visibility: DescriptorVisibility, - modality: Modality, - isCompanion: Boolean, - isInner: Boolean, - isData: Boolean, - isExternal: Boolean, - isInline: Boolean, - isExpect: Boolean, - isFun: Boolean, - source: SourceElement, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrClassSymbol, + name: Name, + kind: ClassKind, + visibility: DescriptorVisibility, + modality: Modality, + isCompanion: Boolean, + isInner: Boolean, + isData: Boolean, + isExternal: Boolean, + isInline: Boolean, + isExpect: Boolean, + isFun: Boolean, + source: SourceElement, ): IrClass = PersistentIrClass( startOffset, endOffset, origin, symbol, name, kind, visibility, modality, @@ -53,18 +53,18 @@ object PersistentIrFactory : IrFactory { ) override fun createConstructor( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrConstructorSymbol, - name: Name, - visibility: DescriptorVisibility, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isPrimary: Boolean, - isExpect: Boolean, - containerSource: DeserializedContainerSource?, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrConstructorSymbol, + name: Name, + visibility: DescriptorVisibility, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isPrimary: Boolean, + isExpect: Boolean, + containerSource: DeserializedContainerSource?, ): IrConstructor = PersistentIrConstructor( startOffset, endOffset, origin, symbol, name, visibility, returnType, isInline, isExternal, isPrimary, isExpect, @@ -88,37 +88,37 @@ object PersistentIrFactory : IrFactory { PersistentIrErrorDeclaration(startOffset, endOffset, descriptor) override fun createField( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrFieldSymbol, - name: Name, - type: IrType, - visibility: DescriptorVisibility, - isFinal: Boolean, - isExternal: Boolean, - isStatic: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrFieldSymbol, + name: Name, + type: IrType, + visibility: DescriptorVisibility, + isFinal: Boolean, + isExternal: Boolean, + isStatic: Boolean, ): IrField = PersistentIrField(startOffset, endOffset, origin, symbol, name, type, visibility, isFinal, isExternal, isStatic) override fun createFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrSimpleFunctionSymbol, - name: Name, - visibility: DescriptorVisibility, - modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, - isFakeOverride: Boolean, - containerSource: DeserializedContainerSource?, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrSimpleFunctionSymbol, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, + isFakeOverride: Boolean, + containerSource: DeserializedContainerSource?, ): IrSimpleFunction = PersistentIrFunction( startOffset, endOffset, origin, symbol, name, visibility, modality, returnType, @@ -127,20 +127,20 @@ object PersistentIrFactory : IrFactory { ) override fun createFakeOverrideFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: DescriptorVisibility, - modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, ): IrSimpleFunction = PersistentIrFakeOverrideFunction( startOffset, endOffset, origin, name, visibility, modality, returnType, @@ -161,21 +161,21 @@ object PersistentIrFactory : IrFactory { ) override fun createProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrPropertySymbol, - name: Name, - visibility: DescriptorVisibility, - modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean, - isFakeOverride: Boolean, - containerSource: DeserializedContainerSource?, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrPropertySymbol, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean, + isFakeOverride: Boolean, + containerSource: DeserializedContainerSource?, ): IrProperty = PersistentIrProperty( startOffset, endOffset, origin, symbol, name, visibility, modality, @@ -184,18 +184,18 @@ object PersistentIrFactory : IrFactory { ) override fun createFakeOverrideProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: DescriptorVisibility, - modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean, ): IrProperty = PersistentIrFakeOverrideProperty( startOffset, endOffset, origin, name, visibility, modality, @@ -203,14 +203,14 @@ object PersistentIrFactory : IrFactory { ) override fun createTypeAlias( - startOffset: Int, - endOffset: Int, - symbol: IrTypeAliasSymbol, - name: Name, - visibility: DescriptorVisibility, - expandedType: IrType, - isActual: Boolean, - origin: IrDeclarationOrigin, + startOffset: Int, + endOffset: Int, + symbol: IrTypeAliasSymbol, + name: Name, + visibility: DescriptorVisibility, + expandedType: IrType, + isActual: Boolean, + origin: IrDeclarationOrigin, ): IrTypeAlias = PersistentIrTypeAlias(startOffset, endOffset, symbol, name, visibility, expandedType, isActual, origin) @@ -239,7 +239,9 @@ object PersistentIrFactory : IrFactory { isNoinline: Boolean, isHidden: Boolean ): IrValueParameter = - PersistentIrValueParameter(startOffset, endOffset, origin, symbol, name, index, type, varargElementType, isCrossinline, isNoinline, isHidden) + PersistentIrValueParameter( + startOffset, endOffset, origin, symbol, name, index, type, varargElementType, isCrossinline, isNoinline, isHidden + ) override fun createExpressionBody( startOffset: Int, diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrField.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrField.kt index 65d4d37c7f5..716cdcce774 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrField.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrField.kt @@ -30,16 +30,16 @@ import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.name.Name internal class PersistentIrField( - override val startOffset: Int, - override val endOffset: Int, - origin: IrDeclarationOrigin, - override val symbol: IrFieldSymbol, - override val name: Name, - type: IrType, - override var visibility: DescriptorVisibility, - override val isFinal: Boolean, - override val isExternal: Boolean, - override val isStatic: Boolean + override val startOffset: Int, + override val endOffset: Int, + origin: IrDeclarationOrigin, + override val symbol: IrFieldSymbol, + override val name: Name, + type: IrType, + override var visibility: DescriptorVisibility, + override val isFinal: Boolean, + override val isExternal: Boolean, + override val isStatic: Boolean ) : IrField(), PersistentIrDeclarationBase, FieldCarrier { diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunction.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunction.kt index bc31666b91b..8308ca56e41 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunction.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunction.kt @@ -23,20 +23,20 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource internal abstract class PersistentIrFunctionCommon( - override val startOffset: Int, - override val endOffset: Int, - origin: IrDeclarationOrigin, - override val name: Name, - visibility: DescriptorVisibility, - returnType: IrType, - override val isInline: Boolean, - override val isExternal: Boolean, - override val isTailrec: Boolean, - override val isSuspend: Boolean, - override val isOperator: Boolean, - override val isInfix: Boolean, - override val isExpect: Boolean, - override val containerSource: DeserializedContainerSource? = null + override val startOffset: Int, + override val endOffset: Int, + origin: IrDeclarationOrigin, + override val name: Name, + visibility: DescriptorVisibility, + returnType: IrType, + override val isInline: Boolean, + override val isExternal: Boolean, + override val isTailrec: Boolean, + override val isSuspend: Boolean, + override val isOperator: Boolean, + override val isInfix: Boolean, + override val isExpect: Boolean, + override val containerSource: DeserializedContainerSource? = null ) : IrSimpleFunction(), PersistentIrDeclarationBase, FunctionCarrier { @@ -175,23 +175,23 @@ internal abstract class PersistentIrFunctionCommon( } internal class PersistentIrFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - override val symbol: IrSimpleFunctionSymbol, - name: Name, - visibility: DescriptorVisibility, - override val modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, - override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, - containerSource: DeserializedContainerSource? + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + override val symbol: IrSimpleFunctionSymbol, + name: Name, + visibility: DescriptorVisibility, + override val modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, + override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, + containerSource: DeserializedContainerSource? ) : PersistentIrFunctionCommon( startOffset, endOffset, origin, name, visibility, returnType, isInline, isExternal, isTailrec, isSuspend, isOperator, isInfix, isExpect, @@ -207,20 +207,20 @@ internal class PersistentIrFunction( } internal class PersistentIrFakeOverrideFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - override var visibility: DescriptorVisibility, - override var modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + override var visibility: DescriptorVisibility, + override var modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, ) : PersistentIrFunctionCommon( startOffset, endOffset, origin, name, visibility, returnType, isInline, isExternal, isTailrec, isSuspend, isOperator, isInfix, isExpect, diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrProperty.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrProperty.kt index c773f89c090..a88ac15d1b6 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrProperty.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrProperty.kt @@ -30,18 +30,18 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource internal abstract class PersistentIrPropertyCommon( - override val startOffset: Int, - override val endOffset: Int, - origin: IrDeclarationOrigin, - override val name: Name, - override var visibility: DescriptorVisibility, - override val isVar: Boolean, - override val isConst: Boolean, - override val isLateinit: Boolean, - override val isDelegated: Boolean, - override val isExternal: Boolean, - override val isExpect: Boolean, - override val containerSource: DeserializedContainerSource?, + override val startOffset: Int, + override val endOffset: Int, + origin: IrDeclarationOrigin, + override val name: Name, + override var visibility: DescriptorVisibility, + override val isVar: Boolean, + override val isConst: Boolean, + override val isLateinit: Boolean, + override val isDelegated: Boolean, + override val isExternal: Boolean, + override val isExpect: Boolean, + override val containerSource: DeserializedContainerSource?, ) : IrProperty(), PersistentIrDeclarationBase, PropertyCarrier { @@ -109,21 +109,21 @@ internal abstract class PersistentIrPropertyCommon( } internal class PersistentIrProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - override val symbol: IrPropertySymbol, - name: Name, - visibility: DescriptorVisibility, - override val modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean = false, - override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, - containerSource: DeserializedContainerSource?, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + override val symbol: IrPropertySymbol, + name: Name, + visibility: DescriptorVisibility, + override val modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean = false, + override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, + containerSource: DeserializedContainerSource?, ) : PersistentIrPropertyCommon( startOffset, endOffset, origin, name, visibility, isVar, isConst, isLateinit, isDelegated, isExternal, isExpect, containerSource, @@ -138,18 +138,18 @@ internal class PersistentIrProperty( } internal class PersistentIrFakeOverrideProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: DescriptorVisibility, - override var modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + override var modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean, ) : PersistentIrPropertyCommon( startOffset, endOffset, origin, name, visibility, isVar, isConst, isLateinit, isDelegated, isExternal, isExpect, diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrTypeAlias.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrTypeAlias.kt index ca7d68ad4f2..a37ba1dd1ec 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrTypeAlias.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrTypeAlias.kt @@ -17,14 +17,14 @@ import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.name.Name internal class PersistentIrTypeAlias( - override val startOffset: Int, - override val endOffset: Int, - override val symbol: IrTypeAliasSymbol, - override val name: Name, - override var visibility: DescriptorVisibility, - expandedType: IrType, - override val isActual: Boolean, - origin: IrDeclarationOrigin + override val startOffset: Int, + override val endOffset: Int, + override val symbol: IrTypeAliasSymbol, + override val name: Name, + override var visibility: DescriptorVisibility, + expandedType: IrType, + override val isActual: Boolean, + origin: IrDeclarationOrigin ) : IrTypeAlias(), PersistentIrDeclarationBase, TypeAliasCarrier { diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrTypeParameter.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrTypeParameter.kt index bdb48bfbc96..4de9e93a666 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrTypeParameter.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrTypeParameter.kt @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.types.Variance -import org.jetbrains.kotlin.utils.SmartList internal class PersistentIrTypeParameter( override val startOffset: Int, diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrValueParameter.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrValueParameter.kt index 3ba3c37363c..4854471e787 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrValueParameter.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrValueParameter.kt @@ -53,7 +53,7 @@ internal class PersistentIrValueParameter( init { symbol.bind(this) } - + override var lastModified: Int = stageController.currentStage override var loweredUpTo: Int = stageController.currentStage override var values: Array? = null diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ClassCarrier.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ClassCarrier.kt index fcce1e00726..6a6bb7046d1 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ClassCarrier.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ClassCarrier.kt @@ -38,15 +38,15 @@ internal interface ClassCarrier : DeclarationCarrier { } internal class ClassCarrierImpl( - override val lastModified: Int, - override var parentField: IrDeclarationParent?, - override var originField: IrDeclarationOrigin, - override var annotationsField: List, - override var thisReceiverField: IrValueParameter?, - override var metadataField: MetadataSource?, - override var visibilityField: DescriptorVisibility, - override var modalityField: Modality, - override var attributeOwnerIdField: IrAttributeContainer, - override var typeParametersField: List, - override var superTypesField: List + override val lastModified: Int, + override var parentField: IrDeclarationParent?, + override var originField: IrDeclarationOrigin, + override var annotationsField: List, + override var thisReceiverField: IrValueParameter?, + override var metadataField: MetadataSource?, + override var visibilityField: DescriptorVisibility, + override var modalityField: Modality, + override var attributeOwnerIdField: IrAttributeContainer, + override var typeParametersField: List, + override var superTypesField: List ) : ClassCarrier diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ConstructorCarrier.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ConstructorCarrier.kt index 2da5223aa70..11dee7fcb92 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ConstructorCarrier.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ConstructorCarrier.kt @@ -31,16 +31,16 @@ internal interface ConstructorCarrier : FunctionBaseCarrier { } internal class ConstructorCarrierImpl( - override val lastModified: Int, - override var parentField: IrDeclarationParent?, - override var originField: IrDeclarationOrigin, - override var annotationsField: List, - override var returnTypeFieldField: IrType, - override var dispatchReceiverParameterField: IrValueParameter?, - override var extensionReceiverParameterField: IrValueParameter?, - override var bodyField: IrBody?, - override var metadataField: MetadataSource?, - override var visibilityField: DescriptorVisibility, - override var typeParametersField: List, - override var valueParametersField: List + override val lastModified: Int, + override var parentField: IrDeclarationParent?, + override var originField: IrDeclarationOrigin, + override var annotationsField: List, + override var returnTypeFieldField: IrType, + override var dispatchReceiverParameterField: IrValueParameter?, + override var extensionReceiverParameterField: IrValueParameter?, + override var bodyField: IrBody?, + override var metadataField: MetadataSource?, + override var visibilityField: DescriptorVisibility, + override var typeParametersField: List, + override var valueParametersField: List ) : ConstructorCarrier diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/DeclarationCarrier.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/DeclarationCarrier.kt index f39a6ca535a..8bce7c308a2 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/DeclarationCarrier.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/DeclarationCarrier.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent import org.jetbrains.kotlin.ir.expressions.IrConstructorCall -interface DeclarationCarrier: Carrier { +interface DeclarationCarrier : Carrier { var parentField: IrDeclarationParent? var originField: IrDeclarationOrigin var annotationsField: List diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/EnumEntryCarrier.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/EnumEntryCarrier.kt index 371ce8fb83a..94e2257f7c8 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/EnumEntryCarrier.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/EnumEntryCarrier.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.ir.expressions.IrExpressionBody internal interface EnumEntryCarrier : DeclarationCarrier { var correspondingClassField: IrClass? var initializerExpressionField: IrExpressionBody? - + override fun clone(): EnumEntryCarrier { return EnumEntryCarrierImpl( lastModified, diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FieldCarrier.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FieldCarrier.kt index ae32b1633ed..224a1ffbfb0 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FieldCarrier.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FieldCarrier.kt @@ -42,4 +42,4 @@ internal class FieldCarrierImpl( override var initializerField: IrExpressionBody?, override var correspondingPropertySymbolField: IrPropertySymbol?, override var metadataField: MetadataSource? -): FieldCarrier +) : FieldCarrier diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FunctionCarrier.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FunctionCarrier.kt index fe70baedb10..22ff537563d 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FunctionCarrier.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FunctionCarrier.kt @@ -40,19 +40,19 @@ internal interface FunctionCarrier : FunctionBaseCarrier { } internal class FunctionCarrierImpl( - override val lastModified: Int, - override var parentField: IrDeclarationParent?, - override var originField: IrDeclarationOrigin, - override var annotationsField: List, - override var returnTypeFieldField: IrType, - override var dispatchReceiverParameterField: IrValueParameter?, - override var extensionReceiverParameterField: IrValueParameter?, - override var bodyField: IrBody?, - override var metadataField: MetadataSource?, - override var visibilityField: DescriptorVisibility, - override var typeParametersField: List, - override var valueParametersField: List, - override var correspondingPropertySymbolField: IrPropertySymbol?, - override var overriddenSymbolsField: List, - override var attributeOwnerIdField: IrAttributeContainer + override val lastModified: Int, + override var parentField: IrDeclarationParent?, + override var originField: IrDeclarationOrigin, + override var annotationsField: List, + override var returnTypeFieldField: IrType, + override var dispatchReceiverParameterField: IrValueParameter?, + override var extensionReceiverParameterField: IrValueParameter?, + override var bodyField: IrBody?, + override var metadataField: MetadataSource?, + override var visibilityField: DescriptorVisibility, + override var typeParametersField: List, + override var valueParametersField: List, + override var correspondingPropertySymbolField: IrPropertySymbol?, + override var overriddenSymbolsField: List, + override var attributeOwnerIdField: IrAttributeContainer ) : FunctionCarrier diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrAnnotationContainer.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrAnnotationContainer.kt index 00a338bb392..936e8335278 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrAnnotationContainer.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrAnnotationContainer.kt @@ -11,6 +11,6 @@ interface IrAnnotationContainer { val annotations: List } -interface IrMutableAnnotationContainer: IrAnnotationContainer { +interface IrMutableAnnotationContainer : IrAnnotationContainer { override var annotations: List -} \ No newline at end of file +} diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclarationOrigin.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclarationOrigin.kt index 1c11f5d9a0b..992c0ba4e97 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclarationOrigin.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclarationOrigin.kt @@ -49,7 +49,7 @@ interface IrDeclarationOrigin { object IR_EXTERNAL_JAVA_DECLARATION_STUB : IrDeclarationOriginImpl("IR_EXTERNAL_JAVA_DECLARATION_STUB") object IR_BUILTINS_STUB : IrDeclarationOriginImpl("IR_BUILTINS_STUB") object BRIDGE : IrDeclarationOriginImpl("BRIDGE", isSynthetic = true) - object BRIDGE_SPECIAL: IrDeclarationOriginImpl("BRIDGE_SPECIAL") + object BRIDGE_SPECIAL : IrDeclarationOriginImpl("BRIDGE_SPECIAL") object FIELD_FOR_ENUM_ENTRY : IrDeclarationOriginImpl("FIELD_FOR_ENUM_ENTRY") object FIELD_FOR_ENUM_VALUES : IrDeclarationOriginImpl("FIELD_FOR_ENUM_VALUES", isSynthetic = true) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt index 7ce06374b7a..ec04456661d 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt @@ -26,37 +26,37 @@ interface IrFactory { ): IrAnonymousInitializer fun createClass( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrClassSymbol, - name: Name, - kind: ClassKind, - visibility: DescriptorVisibility, - modality: Modality, - isCompanion: Boolean = false, - isInner: Boolean = false, - isData: Boolean = false, - isExternal: Boolean = false, - isInline: Boolean = false, - isExpect: Boolean = false, - isFun: Boolean = false, - source: SourceElement = SourceElement.NO_SOURCE, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrClassSymbol, + name: Name, + kind: ClassKind, + visibility: DescriptorVisibility, + modality: Modality, + isCompanion: Boolean = false, + isInner: Boolean = false, + isData: Boolean = false, + isExternal: Boolean = false, + isInline: Boolean = false, + isExpect: Boolean = false, + isFun: Boolean = false, + source: SourceElement = SourceElement.NO_SOURCE, ): IrClass fun createConstructor( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrConstructorSymbol, - name: Name, - visibility: DescriptorVisibility, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isPrimary: Boolean, - isExpect: Boolean, - containerSource: DeserializedContainerSource? = null + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrConstructorSymbol, + name: Name, + visibility: DescriptorVisibility, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isPrimary: Boolean, + isExpect: Boolean, + containerSource: DeserializedContainerSource? = null ): IrConstructor fun createEnumEntry( @@ -74,53 +74,53 @@ interface IrFactory { ): IrErrorDeclaration fun createField( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrFieldSymbol, - name: Name, - type: IrType, - visibility: DescriptorVisibility, - isFinal: Boolean, - isExternal: Boolean, - isStatic: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrFieldSymbol, + name: Name, + type: IrType, + visibility: DescriptorVisibility, + isFinal: Boolean, + isExternal: Boolean, + isStatic: Boolean, ): IrField fun createFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrSimpleFunctionSymbol, - name: Name, - visibility: DescriptorVisibility, - modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, - isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, - containerSource: DeserializedContainerSource? = null, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrSimpleFunctionSymbol, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, + isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, + containerSource: DeserializedContainerSource? = null, ): IrSimpleFunction fun createFakeOverrideFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: DescriptorVisibility, - modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, ): IrSimpleFunction fun createLocalDelegatedProperty( @@ -134,47 +134,47 @@ interface IrFactory { ): IrLocalDelegatedProperty fun createProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrPropertySymbol, - name: Name, - visibility: DescriptorVisibility, - modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean = false, - isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, - containerSource: DeserializedContainerSource? = null + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrPropertySymbol, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean = false, + isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, + containerSource: DeserializedContainerSource? = null ): IrProperty fun createFakeOverrideProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: DescriptorVisibility, - modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean, ): IrProperty fun createTypeAlias( - startOffset: Int, - endOffset: Int, - symbol: IrTypeAliasSymbol, - name: Name, - visibility: DescriptorVisibility, - expandedType: IrType, - isActual: Boolean, - origin: IrDeclarationOrigin, + startOffset: Int, + endOffset: Int, + symbol: IrTypeAliasSymbol, + name: Name, + visibility: DescriptorVisibility, + expandedType: IrType, + isActual: Boolean, + origin: IrDeclarationOrigin, ): IrTypeAlias fun createTypeParameter( diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeParametersContainer.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeParametersContainer.kt index 947849fd7a6..46d1a2c6ffa 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeParametersContainer.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeParametersContainer.kt @@ -18,4 +18,4 @@ package org.jetbrains.kotlin.ir.declarations interface IrTypeParametersContainer : IrDeclaration, IrDeclarationParent { var typeParameters: List -} \ No newline at end of file +} diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrValueParameter.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrValueParameter.kt index d94a2a683e2..dd3db5a6a42 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrValueParameter.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrValueParameter.kt @@ -32,6 +32,7 @@ abstract class IrValueParameter : IrValueDeclaration(), IrSymbolDeclaration