[IR] Drop valueArgumentsCount from IrConstructorCallImpl

mcpiroman · goodwinnk · commit f4868106b52d · 2024-09-05T18:09:40.000+02:00
KT-70057
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrBuiltinSymbolsContainer.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrBuiltinSymbolsContainer.kt
@@ -135,7 +135,6 @@ class Fir2IrBuiltinSymbolsContainer(
             constructorSymbol,
             typeArgumentsCount = 0,
             constructorTypeArgumentsCount = 0,
-            valueArgumentsCount = 0,
         )
     }
 
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/IrBuiltInsOverFir.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/IrBuiltInsOverFir.kt
@@ -377,7 +377,6 @@ class IrBuiltInsOverFir(
             constructorSymbol,
             typeArgumentsCount = 0,
             constructorTypeArgumentsCount = 0,
-            valueArgumentsCount = 0,
         )
 
         annotationCall
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt
@@ -873,7 +873,7 @@ class CallAndReferenceGenerator(
                 @OptIn(UnsafeDuringIrConstructionAPI::class) // Error class constructor is already created, see IrErrorClassImpl.
                 IrConstructorCallImpl(
                     startOffset, endOffset, type, type.symbol.owner.primaryConstructor!!.symbol,
-                    valueArgumentsCount = 0, typeArgumentsCount = 0, constructorTypeArgumentsCount = 0,
+                    typeArgumentsCount = 0, constructorTypeArgumentsCount = 0,
                     source = FirAnnotationSourceElement(annotation),
                 )
             }
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
@@ -416,7 +416,6 @@ class IrValidatorTest {
                 symbol = annotationConstructor.symbol,
                 typeArgumentsCount = 0,
                 constructorTypeArgumentsCount = 0,
-                valueArgumentsCount = 0,
             )
         )
         file2.addChild(annotatedClass)
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/ir/IrBuilder.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/ir/IrBuilder.kt
@@ -91,7 +91,6 @@ object JsIrBuilder {
             target,
             typeArgumentsCount = irClass.typeParameters.size,
             constructorTypeArgumentsCount = owner.typeParameters.size,
-            valueArgumentsCount = owner.valueParameters.size,
             origin = origin
         ).apply {
             typeArguments?.let {
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
@@ -92,7 +92,6 @@ class CallableReferenceLowering(private val context: JsCommonBackendContext) : B
                     startOffset, endOffset, type, ctor.symbol,
                     typeArgumentsCount = 0, /*TODO: properly set type arguments*/
                     constructorTypeArgumentsCount = 0,
-                    valueArgumentsCount = vpCount,
                     origin = JsStatementOrigins.CALLABLE_REFERENCE_CREATE
                 ).apply {
                     boundReceiver?.let {
@@ -323,7 +322,6 @@ class CallableReferenceLowering(private val context: JsCommonBackendContext) : B
                             callee.symbol,
                             callee.countContextTypeParameters(),
                             callee.typeParameters.size,
-                            callee.valueParameters.size,
                             JsStatementOrigins.CALLABLE_REFERENCE_INVOKE
                         )
                     is IrSimpleFunction ->
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
@@ -535,8 +535,7 @@ class InteropCallableReferenceLowering(val context: JsIrBackendContext) : BodyLo
                     lambdaType,
                     constructor.symbol,
                     lambdaInfo.lambdaClass.typeParameters.size,
-                    constructor.typeParameters.size,
-                    constructor.valueParameters.size
+                    constructor.typeParameters.size
                 )
 
                 for ((i, vp) in factoryFunction.valueParameters.withIndex()) {
diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/DirectInvokeLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/DirectInvokeLowering.kt
@@ -101,8 +101,7 @@ internal class DirectInvokeLowering(private val context: JvmBackendContext) : Fi
                 IrConstructorCallImpl(
                     expression.startOffset, expression.endOffset, expression.type, irFun.symbol,
                     typeArgumentsCount = irFun.typeParameters.size,
-                    constructorTypeArgumentsCount = 0,
-                    valueArgumentsCount = irFun.valueParameters.size
+                    constructorTypeArgumentsCount = 0
                 ).apply {
                     copyReceiverAndValueArgumentsForDirectInvoke(receiver, expression)
                 }
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/BuiltInsLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/BuiltInsLowering.kt
@@ -184,7 +184,6 @@ class BuiltInsLowering(val context: WasmBackendContext) : FileLoweringPass {
                     type = kclassConstructor.returnType,
                     symbol = kclassConstructor.symbol,
                     typeArgumentsCount = 1,
-                    valueArgumentsCount = 1,
                     constructorTypeArgumentsCount = 0
                 ).also {
                     it.putClassTypeArgument(0, type)
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmSharedVariablesManager.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmSharedVariablesManager.kt
@@ -41,8 +41,7 @@ class WasmSharedVariablesManager(val context: WasmBackendContext) : SharedVariab
                 type = boxClass.defaultType,
                 symbol = constructorSymbol,
                 typeArgumentsCount = boxClass.owner.typeParameters.size,
-                constructorTypeArgumentsCount = constructorSymbol.owner.typeParameters.size,
-                valueArgumentsCount = constructorSymbol.owner.valueParameters.size
+                constructorTypeArgumentsCount = constructorSymbol.owner.typeParameters.size
             ).apply {
                 putValueArgument(0, initializer)
             }
diff --git a/compiler/ir/ir.actualization/src/main/kotlin/org/jetbrains/kotlin/backend/common/actualizer/ExpectActualLinker.kt b/compiler/ir/ir.actualization/src/main/kotlin/org/jetbrains/kotlin/backend/common/actualizer/ExpectActualLinker.kt
@@ -256,7 +256,6 @@ internal open class ActualizerVisitor(private val symbolRemapper: SymbolRemapper
             constructorSymbol,
             expression.typeArgumentsCount,
             expression.constructorTypeArgumentsCount,
-            valueArgumentsCount,
             mapStatementOrigin(expression.origin),
         ).apply {
             copyRemappedTypeArgumentsFrom(expression)
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt
@@ -260,7 +260,6 @@ fun IrBuilderWithScope.irCall(
 ): IrConstructorCall =
     IrConstructorCallImpl(
         startOffset, endOffset, type, callee,
-        valueArgumentsCount = callee.owner.valueParameters.size,
         typeArgumentsCount = callee.owner.typeParameters.size + constructedClass.typeParameters.size,
         constructorTypeArgumentsCount = callee.owner.typeParameters.size
     )
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/builders.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/builders.kt
@@ -841,9 +841,9 @@ fun IrConstructorCallImpl(
     symbol: IrConstructorSymbol,
     typeArgumentsCount: Int,
     constructorTypeArgumentsCount: Int,
-    valueArgumentsCount: Int = symbol.owner.valueParameters.size,
     origin: IrStatementOrigin? = null,
     source: SourceElement = SourceElement.NO_SOURCE,
+    valueArgumentsCount: Int = symbol.owner.valueParameters.size,
 ): IrConstructorCallImpl = IrConstructorCallImplWithShape(
     startOffset = startOffset,
     endOffset = endOffset,
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
@@ -518,7 +518,6 @@ fun irConstructorCall(
             symbol = newSymbol,
             typeArgumentsCount = typeArgumentsCount,
             constructorTypeArgumentsCount = 0,
-            valueArgumentsCount = call.valueArgumentsCount,
             origin = origin
         ).apply {
             copyTypeAndValueArgumentsFrom(
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
@@ -262,7 +262,6 @@ class AtomicfuJsIrTransformer(private val context: IrPluginContext) {
                     arrayConstructorSymbol.owner.returnType, arrayConstructorSymbol,
                     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
@@ -199,7 +199,6 @@ class ClassStabilityTransformer(
             StabilityInferredClass.constructors.first(),
             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
@@ -516,7 +516,6 @@ class ComposableTargetAnnotationsTransformer(
             classSymbol.constructors.first(),
             typeArgumentsCount = 0,
             constructorTypeArgumentsCount = 0,
-            valueArgumentsCount = 1,
             origin = null
         )
 
diff --git a/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableTypeRemapper.kt b/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableTypeRemapper.kt
@@ -22,13 +22,11 @@ import androidx.compose.compiler.plugins.kotlin.hasComposableAnnotation
 import androidx.compose.compiler.plugins.kotlin.isComposableAnnotation
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContextImpl
-import org.jetbrains.kotlin.backend.common.peek
 import org.jetbrains.kotlin.backend.common.pop
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.*
-import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrCallImplWithShape
 import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
@@ -145,7 +143,6 @@ internal class DeepCopyIrTreeWithRemappedComposableTypes(
                 newCallee,
                 expression.typeArgumentsCount,
                 expression.constructorTypeArgumentsCount,
-                expression.valueArgumentsCount,
                 mapStatementOrigin(expression.origin)
             ).apply {
                 copyRemappedTypeArgumentsFrom(expression)
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
@@ -178,8 +178,7 @@ class ComposerParamTransformer(
             type = composableIrClass.defaultType,
             symbol = composableIrClass.primaryConstructor!!.symbol,
             typeArgumentsCount = 0,
-            constructorTypeArgumentsCount = 0,
-            valueArgumentsCount = 0
+            constructorTypeArgumentsCount = 0
         )
 
     fun IrCall.withComposerParamIfNeeded(composerParam: IrValueParameter): IrCall {
@@ -320,7 +319,6 @@ class ComposerParamTransformer(
                 ctor,
                 typeArgumentsCount = 0,
                 constructorTypeArgumentsCount = 0,
-                valueArgumentsCount = 1,
                 origin = null
             ).also {
                 it.putValueArgument(0, underlyingType.defaultValue(startOffset, endOffset))
@@ -436,7 +434,6 @@ class ComposerParamTransformer(
             symbol = ctor,
             typeArgumentsCount = 0,
             constructorTypeArgumentsCount = 0,
-            valueArgumentsCount = 1,
         ).also {
             it.putValueArgument(
                 0,
@@ -699,7 +696,6 @@ class ComposerParamTransformer(
             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
@@ -173,7 +173,6 @@ class DurableFunctionKeyTransformer(
         keyMetaAnnotation.constructors.single(),
         typeArgumentsCount = 0,
         constructorTypeArgumentsCount = 0,
-        valueArgumentsCount = 3
     ).apply {
         putValueArgument(0, irConst(key.key.hashCode()))
         putValueArgument(1, irConst(key.startOffset))
@@ -189,7 +188,6 @@ class DurableFunctionKeyTransformer(
         metaClassAnnotation.constructors.single(),
         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
@@ -214,8 +214,7 @@ open class LiveLiteralTransformer(
         liveLiteralInfoAnnotation.defaultType,
         liveLiteralInfoAnnotation.constructors.single(),
         typeArgumentsCount = 0,
-        constructorTypeArgumentsCount = 0,
-        valueArgumentsCount = 2
+        constructorTypeArgumentsCount = 0
     ).apply {
         putValueArgument(0, irConst(key))
         putValueArgument(1, irConst(offset))
@@ -229,8 +228,7 @@ open class LiveLiteralTransformer(
         liveLiteralFileInfoAnnotation.defaultType,
         liveLiteralFileInfoAnnotation.constructors.single(),
         typeArgumentsCount = 0,
-        constructorTypeArgumentsCount = 0,
-        valueArgumentsCount = 1
+        constructorTypeArgumentsCount = 0
     ).apply {
         putValueArgument(0, irConst(file))
     }
diff --git a/plugins/fir-plugin-prototype/src/org/jetbrains/kotlin/ir/plugin/AbstractTransformerForGenerator.kt b/plugins/fir-plugin-prototype/src/org/jetbrains/kotlin/ir/plugin/AbstractTransformerForGenerator.kt
@@ -80,8 +80,7 @@ abstract class AbstractTransformerForGenerator(
             constructedType,
             constructor.symbol,
             typeArgumentsCount = 0,
-            constructorTypeArgumentsCount = 0,
-            valueArgumentsCount = 0
+            constructorTypeArgumentsCount = 0
         )
         val returnStatement = IrReturnImpl(-1, -1, irBuiltIns.nothingType, function.symbol, constructorCall)
         return irFactory.createBlockBody(-1, -1, listOf(returnStatement))
diff --git a/plugins/kotlinx-serialization/kotlinx-serialization.backend/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/BaseIrGenerator.kt b/plugins/kotlinx-serialization/kotlinx-serialization.backend/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/BaseIrGenerator.kt
@@ -81,7 +81,6 @@ abstract class BaseIrGenerator(private val currentClass: IrClass, final override
             jsExportIgnoreCtor.symbol,
             jsExportIgnore.typeParameters.size,
             jsExportIgnoreCtor.typeParameters.size,
-            jsExportIgnoreCtor.valueParameters.size,
         )
     }
 

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,6 @@ class Fir2IrBuiltinSymbolsContainer(`
`135`	`135`	`constructorSymbol,`
`136`	`136`	`typeArgumentsCount = 0,`
`137`	`137`	`constructorTypeArgumentsCount = 0,`
`138`		`- valueArgumentsCount = 0,`
`139`	`138`	`)`
`140`	`139`	`}`
`141`	`140`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,6 @@ class IrBuiltInsOverFir(`
`377`	`377`	`constructorSymbol,`
`378`	`378`	`typeArgumentsCount = 0,`
`379`	`379`	`constructorTypeArgumentsCount = 0,`
`380`		`- valueArgumentsCount = 0,`
`381`	`380`	`)`
`382`	`381`
`383`	`382`	`annotationCall`
Original file line number	Diff line number	Diff line change
`@@ -873,7 +873,7 @@ class CallAndReferenceGenerator(`
`873`	`873`	`@OptIn(UnsafeDuringIrConstructionAPI::class) // Error class constructor is already created, see IrErrorClassImpl.`
`874`	`874`	`IrConstructorCallImpl(`
`875`	`875`	`startOffset, endOffset, type, type.symbol.owner.primaryConstructor!!.symbol,`
`876`		`- valueArgumentsCount = 0, typeArgumentsCount = 0, constructorTypeArgumentsCount = 0,`
	`876`	`+ typeArgumentsCount = 0, constructorTypeArgumentsCount = 0,`
`877`	`877`	`source = FirAnnotationSourceElement(annotation),`
`878`	`878`	`)`
`879`	`879`	`}`
Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,6 @@ class IrValidatorTest {`
`416`	`416`	`symbol = annotationConstructor.symbol,`
`417`	`417`	`typeArgumentsCount = 0,`
`418`	`418`	`constructorTypeArgumentsCount = 0,`
`419`		`- valueArgumentsCount = 0,`
`420`	`419`	`)`
`421`	`420`	`)`
`422`	`421`	`file2.addChild(annotatedClass)`
Original file line number	Diff line number	Diff line change
`@@ -535,8 +535,7 @@ class InteropCallableReferenceLowering(val context: JsIrBackendContext) : BodyLo`
`535`	`535`	`lambdaType,`
`536`	`536`	`constructor.symbol,`
`537`	`537`	`lambdaInfo.lambdaClass.typeParameters.size,`
`538`		`- constructor.typeParameters.size,`
`539`		`- constructor.valueParameters.size`
	`538`	`+ constructor.typeParameters.size`
`540`	`539`	`)`
`541`	`540`
`542`	`541`	`for ((i, vp) in factoryFunction.valueParameters.withIndex()) {`