[IR] Add *WithShape versions to IR call factory functions

KT-70057

Author: mcpiroman

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/builders.kt

@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.declarations.IrVariable
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.symbols.*
+import org.jetbrains.kotlin.ir.symbols.impl.IrFunctionFakeOverrideSymbol
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.util.*
 
@@ -784,7 +785,35 @@ fun IrWhileLoopImpl(
     origin = origin,
 )
 
+private fun IrFunctionSymbol.getRealOwner(): IrFunction {
+    var symbol = this
+    if (this is IrFunctionFakeOverrideSymbol) {
+        symbol = originalSymbol
+    }
+    return symbol.owner
+}
+
 fun IrCallImpl(
+    startOffset: Int,
+    endOffset: Int,
+    type: IrType,
+    symbol: IrSimpleFunctionSymbol,
+    typeArgumentsCount: Int = symbol.getRealOwner().typeParameters.size,
+    valueArgumentsCount: Int = symbol.getRealOwner().valueParameters.size,
+    origin: IrStatementOrigin? = null,
+    superQualifierSymbol: IrClassSymbol? = null,
+): IrCallImpl = IrCallImplWithShape(
+    startOffset = startOffset,
+    endOffset = endOffset,
+    type = type,
+    symbol = symbol,
+    typeArgumentsCount = typeArgumentsCount,
+    valueArgumentsCount = valueArgumentsCount,
+    origin = origin,
+    superQualifierSymbol = superQualifierSymbol,
+)
+
+fun IrCallImplWithShape(
     startOffset: Int,
     endOffset: Int,
     type: IrType,
@@ -806,6 +835,28 @@ fun IrCallImpl(
 )
 
 fun IrConstructorCallImpl(
+    startOffset: Int,
+    endOffset: Int,
+    type: IrType,
+    symbol: IrConstructorSymbol,
+    typeArgumentsCount: Int,
+    constructorTypeArgumentsCount: Int,
+    valueArgumentsCount: Int = symbol.owner.valueParameters.size,
+    origin: IrStatementOrigin? = null,
+    source: SourceElement = SourceElement.NO_SOURCE,
+): IrConstructorCallImpl = IrConstructorCallImplWithShape(
+    startOffset = startOffset,
+    endOffset = endOffset,
+    type = type,
+    symbol = symbol,
+    typeArgumentsCount = typeArgumentsCount,
+    constructorTypeArgumentsCount = constructorTypeArgumentsCount,
+    valueArgumentsCount = valueArgumentsCount,
+    origin = origin,
+    source = source
+)
+
+fun IrConstructorCallImplWithShape(
     startOffset: Int,
     endOffset: Int,
     type: IrType,
@@ -829,6 +880,22 @@ fun IrConstructorCallImpl(
 )
 
 fun IrDelegatingConstructorCallImpl(
+    startOffset: Int,
+    endOffset: Int,
+    type: IrType,
+    symbol: IrConstructorSymbol,
+    typeArgumentsCount: Int,
+    valueArgumentsCount: Int = symbol.owner.valueParameters.size,
+): IrDelegatingConstructorCallImpl = IrDelegatingConstructorCallImplWithShape(
+    startOffset = startOffset,
+    endOffset = endOffset,
+    type = type,
+    symbol = symbol,
+    typeArgumentsCount = typeArgumentsCount,
+    valueArgumentsCount = valueArgumentsCount
+)
+
+fun IrDelegatingConstructorCallImplWithShape(
     startOffset: Int,
     endOffset: Int,
     type: IrType,
@@ -847,6 +914,22 @@ fun IrDelegatingConstructorCallImpl(
 )
 
 fun IrEnumConstructorCallImpl(
+    startOffset: Int,
+    endOffset: Int,
+    type: IrType,
+    symbol: IrConstructorSymbol,
+    typeArgumentsCount: Int,
+    valueArgumentsCount: Int = symbol.owner.valueParameters.size,
+): IrEnumConstructorCallImpl = IrEnumConstructorCallImplWithShape(
+    startOffset = startOffset,
+    endOffset = endOffset,
+    type = type,
+    symbol = symbol,
+    typeArgumentsCount = typeArgumentsCount,
+    valueArgumentsCount = valueArgumentsCount
+)
+
+fun IrEnumConstructorCallImplWithShape(
     startOffset: Int,
     endOffset: Int,
     type: IrType,
@@ -865,6 +948,26 @@ fun IrEnumConstructorCallImpl(
 )
 
 fun IrFunctionReferenceImpl(
+    startOffset: Int,
+    endOffset: Int,
+    type: IrType,
+    symbol: IrFunctionSymbol,
+    typeArgumentsCount: Int,
+    valueArgumentsCount: Int = symbol.getRealOwner().valueParameters.size,
+    reflectionTarget: IrFunctionSymbol? = symbol,
+    origin: IrStatementOrigin? = null,
+): IrFunctionReferenceImpl = IrFunctionReferenceImplWithShape(
+    startOffset = startOffset,
+    endOffset = endOffset,
+    type = type,
+    symbol = symbol,
+    typeArgumentsCount = typeArgumentsCount,
+    valueArgumentsCount = valueArgumentsCount,
+    reflectionTarget = reflectionTarget,
+    origin = origin,
+)
+
+fun IrFunctionReferenceImplWithShape(
     startOffset: Int,
     endOffset: Int,
     type: IrType,
@@ -944,7 +1047,7 @@ fun IrCallImpl.Companion.fromSymbolDescriptor(
     origin: IrStatementOrigin? = null,
     superQualifierSymbol: IrClassSymbol? = null,
 ): IrCallImpl =
-    IrCallImpl(startOffset, endOffset, type, symbol, typeArgumentsCount, valueArgumentsCount, origin, superQualifierSymbol)
+    IrCallImplWithShape(startOffset, endOffset, type, symbol, typeArgumentsCount, valueArgumentsCount, origin, superQualifierSymbol)
 
 fun IrCallImpl.Companion.fromSymbolOwner(
     startOffset: Int,
@@ -987,7 +1090,7 @@ fun IrConstructorCallImpl.Companion.fromSymbolDescriptor(
     val classTypeParametersCount = constructorDescriptor.constructedClass.original.declaredTypeParameters.size
     val totalTypeParametersCount = constructorDescriptor.typeParameters.size
     val valueParametersCount = constructorDescriptor.valueParameters.size + constructorDescriptor.contextReceiverParameters.size
-    return IrConstructorCallImpl(
+    return IrConstructorCallImplWithShape(
         startOffset, endOffset,
         type,
         constructorSymbol,
@@ -1051,8 +1154,8 @@ fun IrEnumConstructorCallImpl.Companion.fromSymbolDescriptor(
     endOffset: Int,
     type: IrType,
     symbol: IrConstructorSymbol,
-    typeArgumentsCount: Int
-) = IrEnumConstructorCallImpl(startOffset, endOffset, type, symbol, typeArgumentsCount, symbol.descriptor.valueParameters.size)
+    typeArgumentsCount: Int,
+) = IrEnumConstructorCallImplWithShape(startOffset, endOffset, type, symbol, typeArgumentsCount, symbol.descriptor.valueParameters.size)
 
 
 @ObsoleteDescriptorBasedAPI
@@ -1064,7 +1167,7 @@ fun IrDelegatingConstructorCallImpl.Companion.fromSymbolDescriptor(
     typeArgumentsCount: Int = symbol.descriptor.typeParametersCount,
     valueArgumentsCount: Int = symbol.descriptor.valueParameters.size + symbol.descriptor.contextReceiverParameters.size,
 ): IrDelegatingConstructorCallImpl =
-    IrDelegatingConstructorCallImpl(startOffset, endOffset, type, symbol, typeArgumentsCount, valueArgumentsCount)
+    IrDelegatingConstructorCallImplWithShape(startOffset, endOffset, type, symbol, typeArgumentsCount, valueArgumentsCount)
 
 @UnsafeDuringIrConstructionAPI
 fun IrDelegatingConstructorCallImpl.Companion.fromSymbolOwner(
@@ -1087,7 +1190,7 @@ fun IrFunctionReferenceImpl.Companion.fromSymbolDescriptor(
     typeArgumentsCount: Int,
     reflectionTarget: IrFunctionSymbol?,
     origin: IrStatementOrigin? = null,
-): IrFunctionReferenceImpl = IrFunctionReferenceImpl(
+): IrFunctionReferenceImpl = IrFunctionReferenceImplWithShape(
     startOffset, endOffset,
     type,
     symbol,