[IR] Reorder parameters in IrFactory#createProperty

This is to prepare for IrFactory auto-generation (KT-59308).

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt

@@ -929,16 +929,20 @@ class Fir2IrDeclarationStorage(
             val result = declareIrProperty(signature) { symbol ->
                 classifierStorage.preCacheTypeParameters(property, symbol)
                 irFactory.createProperty(
-                    startOffset, endOffset, origin, symbol,
+                    startOffset = startOffset,
-                    property.name, components.visibilityConverter.convertToDescriptorVisibility(property.visibility), property.modality!!,
+                    endOffset = endOffset,
+                    origin = origin,
+                    name = property.name,
+                    visibility = components.visibilityConverter.convertToDescriptorVisibility(property.visibility),
+                    modality = property.modality!!,
+                    symbol = symbol,
                     isVar = property.isVar,
                     isConst = property.isConst,
                     isLateinit = property.isLateInit,
                     isDelegated = property.delegate != null,
                     isExternal = property.isExternal,
-                    isExpect = property.isExpect,
-                    isFakeOverride = origin == IrDeclarationOrigin.FAKE_OVERRIDE,
                     containerSource = property.containerSource,
+                    isExpect = property.isExpect,
                 ).apply {
                     metadata = FirMetadataSource.Property(property)
                     convertAnnotationsForNonDeclaredMembers(property, origin)

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/descriptors/IrDescriptorBasedFunctionFactory.kt

@@ -422,16 +422,19 @@ class IrDescriptorBasedFunctionFactory(
         fun createFakeOverrideProperty(descriptor: PropertyDescriptor): IrProperty {
             return symbolTable.declareProperty(offset, offset, memberOrigin, descriptor) {
                 irFactory.createProperty(
-                    offset, offset, memberOrigin, it,
+                    startOffset = offset,
+                    endOffset = offset,
+                    origin = memberOrigin,
                     name = descriptor.name,
                     visibility = descriptor.visibility,
                     modality = descriptor.modality,
+                    symbol = it,
                     isVar = descriptor.isVar,
                     isConst = descriptor.isConst,
                     isLateinit = descriptor.isLateInit,
                     isDelegated = descriptor.isDelegated,
                     isExternal = descriptor.isEffectivelyExternal(),
-                    isExpect = descriptor.isExpect
+                    isExpect = descriptor.isExpect,
                 ).apply {
                     parent = this@addFakeOverrides
                     getter = descriptor.getter?.let { g -> createFakeOverrideFunction(g, symbol) }

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ReflectionReferencesGenerator.kt

@@ -576,20 +576,19 @@ internal class ReflectionReferencesGenerator(statementGenerator: StatementGenera
                 val offset = UNDEFINED_OFFSET
                 context.symbolTable.declareProperty(offset, offset, IrDeclarationOrigin.SYNTHETIC_JAVA_PROPERTY_DELEGATE, descriptor) {
                     context.irFactory.createProperty(
-                        offset,
+                        startOffset = offset,
-                        offset,
+                        endOffset = offset,
-                        IrDeclarationOrigin.SYNTHETIC_JAVA_PROPERTY_DELEGATE,
+                        origin = IrDeclarationOrigin.SYNTHETIC_JAVA_PROPERTY_DELEGATE,
-                        symbol,
+                        name = descriptor.name,
-                        descriptor.name,
+                        visibility = descriptor.visibility,
-                        descriptor.visibility,
+                        modality = descriptor.modality,
-                        descriptor.modality,
+                        symbol = symbol,
-                        descriptor.isVar,
+                        isVar = descriptor.isVar,
-                        descriptor.isConst,
+                        isConst = descriptor.isConst,
-                        descriptor.isLateInit,
+                        isLateinit = descriptor.isLateInit,
-                        descriptor.isDelegated,
+                        isDelegated = descriptor.isDelegated,
-                        descriptor.isExternal,
+                        isExternal = descriptor.isExternal,
-                        descriptor.isExpect,
+                        isExpect = descriptor.isExpect,
-                        isFakeOverride = false
                     ).also {
                         it.parent = scope.getLocalDeclarationParent()
                     }

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/StandaloneDeclarationGenerator.kt

@@ -242,16 +242,19 @@ internal class StandaloneDeclarationGenerator(private val context: GeneratorCont
         startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, descriptor: PropertyDescriptor, symbol: IrPropertySymbol
     ): IrProperty {
         val irProperty = irFactory.createProperty(
-            startOffset, endOffset, origin, symbol,
+            startOffset = startOffset,
+            endOffset = endOffset,
+            origin = origin,
             name = descriptor.name,
             visibility = descriptor.visibility,
             modality = descriptor.modality,
+            symbol = symbol,
             isVar = descriptor.isVar,
             isConst = descriptor.isConst,
             isLateinit = descriptor.isLateInit,
             isDelegated = false,
             isExternal = descriptor.isEffectivelyExternal(),
-            isExpect = descriptor.isExpect
+            isExpect = descriptor.isExpect,
         )
 
         irProperty.metadata = DescriptorMetadataSource.Property(descriptor)

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/declarations/declarationBuilders.kt

@@ -98,11 +98,21 @@ fun IrClass.addField(
 @PublishedApi
 internal fun IrFactory.buildProperty(builder: IrPropertyBuilder): IrProperty = with(builder) {
     createProperty(
-        startOffset, endOffset, origin,
+        startOffset = startOffset,
-        IrPropertySymbolImpl(),
+        endOffset = endOffset,
-        name, visibility, modality,
+        origin = origin,
-        isVar, isConst, isLateinit, isDelegated, isExternal, isExpect, isFakeOverride,
+        name = name,
-        containerSource,
+        visibility = visibility,
+        modality = modality,
+        symbol = IrPropertySymbolImpl(),
+        isVar = isVar,
+        isConst = isConst,
+        isLateinit = isLateinit,
+        isDelegated = isDelegated,
+        isExternal = isExternal,
+        containerSource = containerSource,
+        isExpect = isExpect,
+        isFakeOverride = isFakeOverride,
     )
 }
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt

@@ -139,18 +139,18 @@ interface IrFactory {
         startOffset: Int,
         endOffset: Int,
         origin: IrDeclarationOrigin,
-        symbol: IrPropertySymbol,
         name: Name,
         visibility: DescriptorVisibility,
         modality: Modality,
+        symbol: IrPropertySymbol,
         isVar: Boolean,
         isConst: Boolean,
         isLateinit: Boolean,
         isDelegated: Boolean,
         isExternal: Boolean,
+        containerSource: DeserializedContainerSource? = null,
         isExpect: Boolean = false,
-        isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE,
+        isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE
-        containerSource: DeserializedContainerSource? = null
     ): IrProperty
 
     fun createPropertyWithLateBinding(

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt

@@ -169,18 +169,18 @@ abstract class AbstractIrFactoryImpl : IrFactory {
         startOffset: Int,
         endOffset: Int,
         origin: IrDeclarationOrigin,
-        symbol: IrPropertySymbol,
         name: Name,
         visibility: DescriptorVisibility,
         modality: Modality,
+        symbol: IrPropertySymbol,
         isVar: Boolean,
         isConst: Boolean,
         isLateinit: Boolean,
         isDelegated: Boolean,
         isExternal: Boolean,
+        containerSource: DeserializedContainerSource?,
         isExpect: Boolean,
         isFakeOverride: Boolean,
-        containerSource: DeserializedContainerSource?,
     ): IrProperty =
         IrPropertyImpl(
             startOffset, endOffset, origin, symbol, name, visibility, modality,

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImplForJsIC.kt

@@ -258,35 +258,35 @@ class IrFactoryImplForJsIC(override val stageController: StageController) : Abst
         startOffset: Int,
         endOffset: Int,
         origin: IrDeclarationOrigin,
-        symbol: IrPropertySymbol,
         name: Name,
         visibility: DescriptorVisibility,
         modality: Modality,
+        symbol: IrPropertySymbol,
         isVar: Boolean,
         isConst: Boolean,
         isLateinit: Boolean,
         isDelegated: Boolean,
         isExternal: Boolean,
+        containerSource: DeserializedContainerSource?,
         isExpect: Boolean,
-        isFakeOverride: Boolean,
+        isFakeOverride: Boolean
-        containerSource: DeserializedContainerSource?
     ): IrProperty {
         return super.createProperty(
             startOffset,
             endOffset,
             origin,
-            symbol,
             name,
             visibility,
             modality,
+            symbol,
             isVar,
             isConst,
             isLateinit,
             isDelegated,
             isExternal,
+            containerSource,
             isExpect,
             isFakeOverride,
-            containerSource,
         ).register()
     }
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/LazyIrFactory.kt

@@ -147,24 +147,37 @@ class LazyIrFactory(
         startOffset: Int,
         endOffset: Int,
         origin: IrDeclarationOrigin,
-        symbol: IrPropertySymbol,
         name: Name,
         visibility: DescriptorVisibility,
         modality: Modality,
+        symbol: IrPropertySymbol,
         isVar: Boolean,
         isConst: Boolean,
         isLateinit: Boolean,
         isDelegated: Boolean,
         isExternal: Boolean,
+        containerSource: DeserializedContainerSource?,
         isExpect: Boolean,
-        isFakeOverride: Boolean,
+        isFakeOverride: Boolean
-        containerSource: DeserializedContainerSource?
     ): IrProperty = if (symbol.isBound)
         symbol.owner
     else
         delegate.createProperty(
-            startOffset, endOffset, origin, symbol, name, visibility, modality,
+            startOffset,
-            isVar, isConst, isLateinit, isDelegated, isExternal, isExpect, isFakeOverride, containerSource
+            endOffset,
+            origin,
+            name,
+            visibility,
+            modality,
+            symbol,
+            isVar,
+            isConst,
+            isLateinit,
+            isDelegated,
+            isExternal,
+            containerSource,
+            isExpect,
+            isFakeOverride,
         )
 
     override fun createTypeAlias(

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt

@@ -235,19 +235,20 @@ open class DeepCopyIrTreeWithSymbols(
 
     override fun visitProperty(declaration: IrProperty): IrProperty =
         declaration.factory.createProperty(
-            declaration.startOffset, declaration.endOffset,
+            startOffset = declaration.startOffset,
-            mapDeclarationOrigin(declaration.origin),
+            endOffset = declaration.endOffset,
-            symbolRemapper.getDeclaredProperty(declaration.symbol),
+            origin = mapDeclarationOrigin(declaration.origin),
-            declaration.name,
+            name = declaration.name,
-            declaration.visibility,
+            visibility = declaration.visibility,
-            declaration.modality,
+            modality = declaration.modality,
+            symbol = symbolRemapper.getDeclaredProperty(declaration.symbol),
             isVar = declaration.isVar,
             isConst = declaration.isConst,
             isLateinit = declaration.isLateinit,
             isDelegated = declaration.isDelegated,
             isExternal = declaration.isExternal,
-            isExpect = declaration.isExpect,
             containerSource = declaration.containerSource,
+            isExpect = declaration.isExpect,
         ).apply {
             transformAnnotations(declaration)
             copyAttributes(declaration)

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt

@@ -798,16 +798,20 @@ open class SymbolTable(
         isDelegated: Boolean = descriptor.isDelegated,
         propertyFactory: (IrPropertySymbol) -> IrProperty = { symbol ->
             irFactory.createProperty(
-                startOffset, endOffset, origin, symbol, name = nameProvider.nameForDeclaration(descriptor),
+                startOffset = startOffset,
+                endOffset = endOffset,
+                origin = origin,
+                name = nameProvider.nameForDeclaration(descriptor),
                 visibility = descriptor.visibility,
                 modality = descriptor.modality,
+                symbol = symbol,
                 isVar = descriptor.isVar,
                 isConst = descriptor.isConst,
                 isLateinit = descriptor.isLateInit,
                 isDelegated = isDelegated,
                 isExternal = descriptor.isEffectivelyExternal(),
                 isExpect = descriptor.isExpect,
-                isFakeOverride = descriptor.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE
+                isFakeOverride = descriptor.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE,
             ).apply {
                 metadata = DescriptorMetadataSource.Property(symbol.descriptor)
             }

compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/MissingDeclarationStubGenerator.kt

@@ -121,10 +121,10 @@ internal class MissingDeclarationStubGenerator(private val builtIns: IrBuiltIns)
             startOffset = UNDEFINED_OFFSET,
             endOffset = UNDEFINED_OFFSET,
             origin = PartiallyLinkedDeclarationOrigin.MISSING_DECLARATION,
-            symbol = symbol,
             name = symbol.guessName(),
             visibility = DescriptorVisibilities.DEFAULT_VISIBILITY,
             modality = Modality.FINAL,
+            symbol = symbol,
             isVar = false,
             isConst = false,
             isLateinit = false,

compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt

@@ -753,18 +753,20 @@ class IrDeclarationDeserializer(
             val propertySymbol: IrPropertySymbol = symbol.checkSymbolType(PROPERTY_SYMBOL)
             val prop = symbolTable.declareProperty(uniqId, { propertySymbol }) {
                 irFactory.createProperty(
-                    startOffset, endOffset, origin,
+                    startOffset = startOffset,
-                    it,
+                    endOffset = endOffset,
-                    deserializeName(proto.name),
+                    origin = origin,
-                    flags.visibility,
+                    name = deserializeName(proto.name),
-                    flags.modality,
+                    visibility = flags.visibility,
-                    flags.isVar,
+                    modality = flags.modality,
-                    flags.isConst,
+                    symbol = it,
-                    flags.isLateinit,
+                    isVar = flags.isVar,
-                    flags.isDelegated,
+                    isConst = flags.isConst,
-                    flags.isExternal || isEffectivelyExternal,
+                    isLateinit = flags.isLateinit,
-                    flags.isExpect,
+                    isDelegated = flags.isDelegated,
-                    flags.isFakeOverride
+                    isExternal = flags.isExternal || isEffectivelyExternal,
+                    isExpect = flags.isExpect,
+                    isFakeOverride = flags.isFakeOverride,
                 )
             }