[IR] Reorder parameters in IrFactory#createTypeAlias

This is to prepare for IrFactory auto-generation (KT-59308).
This commit is contained in:
Sergej Jaskiewicz
2023-06-14 12:59:25 +02:00
committed by Space Team
parent 26a479918b
commit b1f7b5e982
10 changed files with 59 additions and 40 deletions
@@ -171,12 +171,12 @@ interface IrFactory {
fun createTypeAlias(
startOffset: Int,
endOffset: Int,
symbol: IrTypeAliasSymbol,
origin: IrDeclarationOrigin,
name: Name,
visibility: DescriptorVisibility,
expandedType: IrType,
symbol: IrTypeAliasSymbol,
isActual: Boolean,
origin: IrDeclarationOrigin,
expandedType: IrType,
): IrTypeAlias
fun createTypeParameter(
@@ -211,12 +211,12 @@ abstract class AbstractIrFactoryImpl : IrFactory {
override fun createTypeAlias(
startOffset: Int,
endOffset: Int,
symbol: IrTypeAliasSymbol,
origin: IrDeclarationOrigin,
name: Name,
visibility: DescriptorVisibility,
expandedType: IrType,
symbol: IrTypeAliasSymbol,
isActual: Boolean,
origin: IrDeclarationOrigin,
expandedType: IrType,
): IrTypeAlias =
IrTypeAliasImpl(startOffset, endOffset, symbol, name, visibility, expandedType, isActual, origin, factory = this)
@@ -323,22 +323,22 @@ class IrFactoryImplForJsIC(override val stageController: StageController) : Abst
override fun createTypeAlias(
startOffset: Int,
endOffset: Int,
symbol: IrTypeAliasSymbol,
origin: IrDeclarationOrigin,
name: Name,
visibility: DescriptorVisibility,
expandedType: IrType,
symbol: IrTypeAliasSymbol,
isActual: Boolean,
origin: IrDeclarationOrigin
expandedType: IrType
): IrTypeAlias {
return super.createTypeAlias(
startOffset,
endOffset,
symbol,
origin,
name,
visibility,
expandedType,
symbol,
isActual,
origin,
expandedType,
).register()
}
@@ -170,16 +170,16 @@ class LazyIrFactory(
override fun createTypeAlias(
startOffset: Int,
endOffset: Int,
symbol: IrTypeAliasSymbol,
origin: IrDeclarationOrigin,
name: Name,
visibility: DescriptorVisibility,
expandedType: IrType,
symbol: IrTypeAliasSymbol,
isActual: Boolean,
origin: IrDeclarationOrigin
expandedType: IrType
): IrTypeAlias = if (symbol.isBound)
symbol.owner
else
delegate.createTypeAlias(startOffset, endOffset, symbol, name, visibility, expandedType, isActual, origin)
delegate.createTypeAlias(startOffset, endOffset, origin, name, visibility, symbol, isActual, expandedType)
override fun createTypeParameter(
startOffset: Int,
@@ -387,13 +387,14 @@ open class DeepCopyIrTreeWithSymbols(
override fun visitTypeAlias(declaration: IrTypeAlias): IrTypeAlias =
declaration.factory.createTypeAlias(
declaration.startOffset, declaration.endOffset,
symbolRemapper.getDeclaredTypeAlias(declaration.symbol),
symbolRenamer.getTypeAliasName(declaration.symbol),
declaration.visibility,
declaration.expandedType.remapType(),
declaration.isActual,
mapDeclarationOrigin(declaration.origin)
startOffset = declaration.startOffset,
endOffset = declaration.endOffset,
origin = mapDeclarationOrigin(declaration.origin),
name = symbolRenamer.getTypeAliasName(declaration.symbol),
visibility = declaration.visibility,
symbol = symbolRemapper.getDeclaredTypeAlias(declaration.symbol),
isActual = declaration.isActual,
expandedType = declaration.expandedType.remapType(),
).apply {
transformAnnotations(declaration)
copyTypeParametersFrom(declaration)