[IR] Minor: Add parameter names to some Ir*Call calls

mcpiroman · Space Cloud · commit de6ae76acfa1 · 2024-09-05T14:43:58.000Z
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt
@@ -283,8 +283,8 @@ internal class AdapterGenerator(
                     endOffset,
                     type,
                     adapteeSymbol,
-                    callableReferenceAccess.typeArguments.size,
-                    firAdaptee.valueParameters.size + firAdaptee.contextReceivers.size,
+                    typeArgumentsCount = callableReferenceAccess.typeArguments.size,
+                    valueArgumentsCount = firAdaptee.valueParameters.size + firAdaptee.contextReceivers.size,
                     origin = null,
                     superQualifierSymbol = null
                 )
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt
@@ -111,8 +111,8 @@ fun CommonBackendContext.createArrayOfExpression(
         endOffset,
         arrayType,
         ir.symbols.arrayOf,
-        1,
-        1
+        typeArgumentsCount = 1,
+        valueArgumentsCount = 1
     ).apply {
         putTypeArgument(0, arrayElementType)
         putValueArgument(0, arg0)
diff --git a/compiler/ir/backend.common/test/org/jetbrains/kotlin/backend/common/IrValidatorTest.kt b/compiler/ir/backend.common/test/org/jetbrains/kotlin/backend/common/IrValidatorTest.kt
@@ -74,7 +74,11 @@ class IrValidatorTest {
             returnType = TestIrBuiltins.anyType
         }
         val functionCall =
-            IrCallImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, TestIrBuiltins.anyType, function.symbol, 0, 1).apply {
+            IrCallImpl(
+                UNDEFINED_OFFSET, UNDEFINED_OFFSET, TestIrBuiltins.anyType, function.symbol,
+                typeArgumentsCount = 0,
+                valueArgumentsCount = 1,
+            ).apply {
                 dispatchReceiver = stringConcatenationWithWrongType
                 putValueArgument(0, stringConcatenationWithWrongType)
             }
@@ -95,7 +99,11 @@ class IrValidatorTest {
         val body = IrFactoryImpl.createBlockBody(5, 24)
         val stringConcatenationWithWrongType = IrStringConcatenationImpl(9, 20, TestIrBuiltins.anyType)
         val functionCall =
-            IrCallImpl(6, 23, TestIrBuiltins.anyType, function.symbol, 0, 1).apply {
+            IrCallImpl(
+                6, 23, TestIrBuiltins.anyType, function.symbol,
+                typeArgumentsCount = 0,
+                valueArgumentsCount = 1,
+           ).apply {
                 dispatchReceiver = stringConcatenationWithWrongType
                 putValueArgument(0, stringConcatenationWithWrongType)
             }
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt
@@ -64,8 +64,11 @@ class CallableReferenceLowering(private val context: JsCommonBackendContext) : B
                 val vpCount = if (function.isSuspend) 1 else 0
                 val ctorCall =
                     IrConstructorCallImpl(
-                        startOffset, endOffset, type, ctor.symbol, 0 /*TODO: properly set type arguments*/, 0, vpCount,
-                        JsStatementOrigins.CALLABLE_REFERENCE_CREATE
+                        startOffset, endOffset, type, ctor.symbol,
+                        typeArgumentsCount = 0 /*TODO: properly set type arguments*/,
+                        constructorTypeArgumentsCount = 0,
+                        valueArgumentsCount = vpCount,
+                        origin = JsStatementOrigins.CALLABLE_REFERENCE_CREATE
                     ).apply {
                         if (function.isSuspend) {
                             putValueArgument(0, IrConstImpl.constNull(startOffset, endOffset, context.irBuiltIns.nothingNType))
@@ -87,8 +90,10 @@ class CallableReferenceLowering(private val context: JsCommonBackendContext) : B
                 val vpCount = if (boundReceiver != null) 1 else 0
                 val ctorCall = IrConstructorCallImpl(
                     startOffset, endOffset, type, ctor.symbol,
-                    0 /*TODO: properly set type arguments*/, 0,
-                    vpCount, JsStatementOrigins.CALLABLE_REFERENCE_CREATE
+                    typeArgumentsCount = 0, /*TODO: properly set type arguments*/
+                    constructorTypeArgumentsCount = 0,
+                    valueArgumentsCount = vpCount,
+                    origin = JsStatementOrigins.CALLABLE_REFERENCE_CREATE
                 ).apply {
                     boundReceiver?.let {
                         putValueArgument(0, it)
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/InteropCallableReferenceLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/InteropCallableReferenceLowering.kt
@@ -433,10 +433,10 @@ class InteropCallableReferenceLowering(val context: JsIrBackendContext) : BodyLo
             UNDEFINED_OFFSET,
             invokeFun.returnType,
             invokeFun.symbol,
-            0,
-            invokeFun.valueParameters.size,
-            JsStatementOrigins.EXPLICIT_INVOKE,
-            null
+            typeArgumentsCount = 0,
+            valueArgumentsCount = invokeFun.valueParameters.size,
+            origin = JsStatementOrigins.EXPLICIT_INVOKE,
+            superQualifierSymbol = null
         )
 
         fun getValue(d: IrValueDeclaration): IrExpression = IrGetValueImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, d.symbol)
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/InvokeStaticInitializersLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/InvokeStaticInitializersLowering.kt
@@ -34,9 +34,9 @@ class InvokeStaticInitializersLowering(val context: JsCommonBackendContext) : Bo
             irClass.endOffset,
             context.irBuiltIns.unitType,
             instance.symbol,
-            0,
-            0,
-            JsStatementOrigins.SYNTHESIZED_STATEMENT
+            typeArgumentsCount = 0,
+            valueArgumentsCount = 0,
+            origin = JsStatementOrigins.SYNTHESIZED_STATEMENT
         )
 
         (irBody as IrStatementContainer).statements.add(0, getInstanceCall)
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsDefaultParameterInjector.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsDefaultParameterInjector.kt
@@ -79,8 +79,8 @@ class JsDefaultParameterInjector(context: JsIrBackendContext) :
             UNDEFINED_OFFSET,
             context.dynamicType,
             context.intrinsics.jsPrototypeOfSymbol,
-            0,
-            1
+            typeArgumentsCount = 0,
+            valueArgumentsCount = 1
         ).apply {
             putValueArgument(0, owner.jsConstructorReference(context))
         }
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/PropertyReferenceLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/PropertyReferenceLowering.kt
@@ -191,7 +191,11 @@ class PropertyReferenceLowering(private val context: JsIrBackendContext) : BodyL
         }
 
         private fun IrExpression.getJsTypeConstructor(): IrExpression {
-            val irCall = IrCallImpl(startOffset, endOffset, jsClassSymbol.owner.returnType, jsClassSymbol, 1, 0)
+            val irCall = IrCallImpl(
+                startOffset, endOffset, jsClassSymbol.owner.returnType, jsClassSymbol,
+                typeArgumentsCount = 1,
+                valueArgumentsCount = 0,
+            )
             irCall.putTypeArgument(0, type)
             return irCall
         }
@@ -225,7 +229,7 @@ class PropertyReferenceLowering(private val context: JsIrBackendContext) : BodyL
             expression.transformChildrenVoid(this)
 
             val builderCall = expression.run {
-                IrCallImpl(startOffset, endOffset, type, localDelegateBuilderSymbol, typeArgumentsCount, 4)
+                IrCallImpl(startOffset, endOffset, type, localDelegateBuilderSymbol, typeArgumentsCount, valueArgumentsCount = 4)
             }
 
             val localName = expression.symbol.owner.name.asString()
diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt
@@ -241,9 +241,14 @@ internal class JvmInlineClassLowering(context: JvmBackendContext) : JvmValueClas
             ?: return super.visitFunctionAccess(expression)
 
         return IrCallImpl(
-            expression.startOffset, expression.endOffset, function.returnType.substitute(expression.typeSubstitutionMap),
-            replacement.symbol, replacement.typeParameters.size, replacement.valueParameters.size,
-            expression.origin, (expression as? IrCall)?.superQualifierSymbol
+            startOffset = expression.startOffset,
+            endOffset = expression.endOffset,
+            type = function.returnType.substitute(expression.typeSubstitutionMap),
+            symbol = replacement.symbol,
+            typeArgumentsCount = replacement.typeParameters.size,
+            valueArgumentsCount = replacement.valueParameters.size,
+            origin = expression.origin,
+            superQualifierSymbol = (expression as? IrCall)?.superQualifierSymbol
         ).apply {
             buildReplacement(function, expression, replacement)
         }
diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ReplaceNumberToCharCallSitesLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ReplaceNumberToCharCallSitesLowering.kt
@@ -51,7 +51,9 @@ internal class ReplaceNumberToCharCallSitesLowering(val context: JvmBackendConte
         val dispatchReceiver = expression.dispatchReceiver ?: return
         expression.dispatchReceiver = IrCallImpl(
             dispatchReceiver.startOffset, dispatchReceiver.endOffset,
-            context.irBuiltIns.intType, context.irBuiltIns.numberClass.functionByName("toInt"), 0, 0,
+            context.irBuiltIns.intType, context.irBuiltIns.numberClass.functionByName("toInt"),
+            typeArgumentsCount = 0,
+            valueArgumentsCount = 0,
         ).also { toInt ->
             toInt.dispatchReceiver = dispatchReceiver
         }
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/UnitToVoidLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/UnitToVoidLowering.kt
@@ -134,7 +134,11 @@ class UnitToVoidLowering(val context: WasmBackendContext) : FileLoweringPass, Ab
             }
         }
 
-        return IrCallImpl(expr.startOffset, expr.endOffset, symbols.voidType, symbols.findVoidConsumer(expr.type), 0, 1).apply {
+        return IrCallImpl(
+            expr.startOffset, expr.endOffset, symbols.voidType, symbols.findVoidConsumer(expr.type),
+            typeArgumentsCount = 0,
+            valueArgumentsCount = 1,
+        ).apply {
             putValueArgument(0, expr)
         }
     }
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/intermediate/PropertyLValue.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/intermediate/PropertyLValue.kt
@@ -149,10 +149,11 @@ internal class AccessorPropertyLValue(
             IrCallImpl(
                 startOffset, endOffset,
                 type,
-                getter!!, typeArgumentsCount,
-                contextReceiverValues.size,
-                origin,
-                superQualifier
+                getter!!,
+                typeArgumentsCount = typeArgumentsCount,
+                valueArgumentsCount = contextReceiverValues.size,
+                origin = origin,
+                superQualifierSymbol = superQualifier
             ).apply {
                 context.callToSubstitutedDescriptorMap[this] = getterDescriptor
                 putTypeArguments()
@@ -175,10 +176,11 @@ internal class AccessorPropertyLValue(
             IrCallImpl(
                 startOffset, endOffset,
                 returnType,
-                setter!!, typeArgumentsCount,
-                1 + contextReceiverValues.size,
-                origin,
-                superQualifier
+                setter!!,
+                typeArgumentsCount = typeArgumentsCount,
+                valueArgumentsCount = 1 + contextReceiverValues.size,
+                origin = origin,
+                superQualifierSymbol = superQualifier
             ).apply {
                 context.callToSubstitutedDescriptorMap[this] = setterDescriptor
                 putTypeArguments()
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt
@@ -512,14 +512,14 @@ fun irConstructorCall(
 ): IrConstructorCall =
     call.run {
         IrConstructorCallImpl(
-            startOffset,
-            endOffset,
-            type,
-            newSymbol,
-            typeArgumentsCount,
-            0,
-            call.valueArgumentsCount,
-            origin
+            startOffset = startOffset,
+            endOffset = endOffset,
+            type = type,
+            symbol = newSymbol,
+            typeArgumentsCount = typeArgumentsCount,
+            constructorTypeArgumentsCount = 0,
+            valueArgumentsCount = call.valueArgumentsCount,
+            origin = origin
         ).apply {
             copyTypeAndValueArgumentsFrom(
                 call,
diff --git a/plugins/atomicfu/atomicfu-compiler/src/org/jetbrains/kotlinx/atomicfu/compiler/backend/js/AtomicfuJsIrTransformer.kt b/plugins/atomicfu/atomicfu-compiler/src/org/jetbrains/kotlinx/atomicfu/compiler/backend/js/AtomicfuJsIrTransformer.kt
@@ -260,7 +260,9 @@ class AtomicfuJsIrTransformer(private val context: IrPluginContext) {
                 return IrConstructorCallImpl(
                     expression.startOffset, expression.endOffset,
                     arrayConstructorSymbol.owner.returnType, arrayConstructorSymbol,
-                    arrayConstructorSymbol.owner.typeParameters.size, 0, 1
+                    typeArgumentsCount = arrayConstructorSymbol.owner.typeParameters.size,
+                    constructorTypeArgumentsCount = 0,
+                    valueArgumentsCount = 1
                 ).apply {
                     putValueArgument(0, size)
                 }
diff --git a/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ClassStabilityTransformer.kt b/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ClassStabilityTransformer.kt
@@ -197,10 +197,10 @@ class ClassStabilityTransformer(
             UNDEFINED_OFFSET,
             StabilityInferredClass.defaultType,
             StabilityInferredClass.constructors.first(),
-            0,
-            0,
-            1,
-            null
+            typeArgumentsCount = 0,
+            constructorTypeArgumentsCount = 0,
+            valueArgumentsCount = 1,
+            origin = null
         ).also {
             it.putValueArgument(0, irConst(parameterMask))
         }
diff --git a/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableTargetAnnotationsTransformer.kt b/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableTargetAnnotationsTransformer.kt
@@ -514,10 +514,10 @@ class ComposableTargetAnnotationsTransformer(
             UNDEFINED_OFFSET,
             classSymbol.defaultType,
             classSymbol.constructors.first(),
-            0,
-            0,
-            1,
-            null
+            typeArgumentsCount = 0,
+            constructorTypeArgumentsCount = 0,
+            valueArgumentsCount = 1,
+            origin = null
         )
 
     private fun filteredAnnotations(annotations: List<IrConstructorCall>) = annotations
diff --git a/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposerParamTransformer.kt b/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposerParamTransformer.kt
@@ -430,11 +430,13 @@ class ComposerParamTransformer(
         val ctor = jvmName.constructors.first { it.owner.isPrimary }
         val type = jvmName.createType(false, emptyList())
         return IrConstructorCallImpl(
-            UNDEFINED_OFFSET,
-            UNDEFINED_OFFSET,
-            type,
-            ctor,
-            0, 0, 1
+            startOffset = UNDEFINED_OFFSET,
+            endOffset = UNDEFINED_OFFSET,
+            type = type,
+            symbol = ctor,
+            typeArgumentsCount = 0,
+            constructorTypeArgumentsCount = 0,
+            valueArgumentsCount = 1,
         ).also {
             it.putValueArgument(
                 0,
@@ -691,13 +693,13 @@ class ComposerParamTransformer(
         }
         copy.origin = ComposeDefaultValueStubOrigin
         copy.annotations += IrConstructorCallImpl(
-            UNDEFINED_OFFSET,
-            UNDEFINED_OFFSET,
-            jvmSyntheticIrClass.defaultType,
-            jvmSyntheticIrClass.primaryConstructor!!.symbol,
-            0,
-            0,
-            0,
+            startOffset = UNDEFINED_OFFSET,
+            endOffset = UNDEFINED_OFFSET,
+            type = jvmSyntheticIrClass.defaultType,
+            symbol = jvmSyntheticIrClass.primaryConstructor!!.symbol,
+            typeArgumentsCount = 0,
+            constructorTypeArgumentsCount = 0,
+            valueArgumentsCount = 0,
         )
         copy.body = context.irFactory.createBlockBody(UNDEFINED_OFFSET, UNDEFINED_OFFSET) {
             statements.add(
diff --git a/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/DurableFunctionKeyTransformer.kt b/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/DurableFunctionKeyTransformer.kt
@@ -171,9 +171,9 @@ class DurableFunctionKeyTransformer(
         UNDEFINED_OFFSET,
         keyMetaAnnotation!!.defaultType,
         keyMetaAnnotation.constructors.single(),
-        0,
-        0,
-        3
+        typeArgumentsCount = 0,
+        constructorTypeArgumentsCount = 0,
+        valueArgumentsCount = 3
     ).apply {
         putValueArgument(0, irConst(key.key.hashCode()))
         putValueArgument(1, irConst(key.startOffset))
@@ -187,9 +187,9 @@ class DurableFunctionKeyTransformer(
         UNDEFINED_OFFSET,
         metaClassAnnotation!!.defaultType,
         metaClassAnnotation.constructors.single(),
-        0,
-        0,
-        1
+        typeArgumentsCount = 0,
+        constructorTypeArgumentsCount = 0,
+        valueArgumentsCount = 1
     ).apply {
         putValueArgument(0, irConst(file))
     }
diff --git a/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/LiveLiteralTransformer.kt b/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/LiveLiteralTransformer.kt
@@ -213,9 +213,9 @@ open class LiveLiteralTransformer(
         UNDEFINED_OFFSET,
         liveLiteralInfoAnnotation.defaultType,
         liveLiteralInfoAnnotation.constructors.single(),
-        0,
-        0,
-        2
+        typeArgumentsCount = 0,
+        constructorTypeArgumentsCount = 0,
+        valueArgumentsCount = 2
     ).apply {
         putValueArgument(0, irConst(key))
         putValueArgument(1, irConst(offset))
@@ -228,9 +228,9 @@ open class LiveLiteralTransformer(
         UNDEFINED_OFFSET,
         liveLiteralFileInfoAnnotation.defaultType,
         liveLiteralFileInfoAnnotation.constructors.single(),
-        0,
-        0,
-        1
+        typeArgumentsCount = 0,
+        constructorTypeArgumentsCount = 0,
+        valueArgumentsCount = 1
     ).apply {
         putValueArgument(0, irConst(file))
     }

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,11 @@ class PropertyReferenceLowering(private val context: JsIrBackendContext) : BodyL`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`private fun IrExpression.getJsTypeConstructor(): IrExpression {`
`194`		`- val irCall = IrCallImpl(startOffset, endOffset, jsClassSymbol.owner.returnType, jsClassSymbol, 1, 0)`
	`194`	`+ val irCall = IrCallImpl(`
	`195`	`+ startOffset, endOffset, jsClassSymbol.owner.returnType, jsClassSymbol,`
	`196`	`+ typeArgumentsCount = 1,`
	`197`	`+ valueArgumentsCount = 0,`
	`198`	`+ )`
`195`	`199`	`irCall.putTypeArgument(0, type)`
`196`	`200`	`return irCall`
`197`	`201`	`}`
`@@ -225,7 +229,7 @@ class PropertyReferenceLowering(private val context: JsIrBackendContext) : BodyL`
`225`	`229`	`expression.transformChildrenVoid(this)`
`226`	`230`
`227`	`231`	`val builderCall = expression.run {`
`228`		`- IrCallImpl(startOffset, endOffset, type, localDelegateBuilderSymbol, typeArgumentsCount, 4)`
	`232`	`+ IrCallImpl(startOffset, endOffset, type, localDelegateBuilderSymbol, typeArgumentsCount, valueArgumentsCount = 4)`
`229`	`233`	`}`
`230`	`234`
`231`	`235`	`val localName = expression.symbol.owner.name.asString()`