Skip to content

Commit f97bdcb

Browse files
mcpiromangoodwinnk
mcpiroman
authored and
goodwinnk
committed
[IR] Drop valueArgumentsCount from IrCallImpl
KT-70057
1 parent f486810 commit f97bdcb

File tree

62 files changed

+47
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+47
-136
lines changed

‎compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/backend/Fir2IrFakeOverrideStrategy.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,7 @@ class Fir2IrDelegatedMembersGenerationStrategy(
350350
offset,
351351
callReturnType,
352352
delegateTargetFunction.symbol,
353-
delegatedFunction.typeParameters.size,
354-
delegatedFunction.valueParameters.size
353+
delegatedFunction.typeParameters.size
355354
).apply {
356355
val thisDispatchReceiverParameter = delegatedFunction.dispatchReceiverParameter!!
357356
val getField = IrGetFieldImpl(

‎compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrBuiltinSymbolsContainer.kt

+1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ class Fir2IrBuiltinSymbolsContainer(
135135
constructorSymbol,
136136
typeArgumentsCount = 0,
137137
constructorTypeArgumentsCount = 0,
138+
valueArgumentsCount = 0,
138139
)
139140
}
140141

‎compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ internal class AdapterGenerator(
284284
type,
285285
adapteeSymbol,
286286
typeArgumentsCount = callableReferenceAccess.typeArguments.size,
287-
valueArgumentsCount = firAdaptee.valueParameters.size + firAdaptee.contextReceivers.size,
288287
origin = null,
289288
superQualifierSymbol = null
290289
)
@@ -676,8 +675,7 @@ internal class AdapterGenerator(
676675
startOffset, endOffset,
677676
adapterFunction.returnType,
678677
invokeSymbol,
679-
typeArgumentsCount = 0,
680-
valueArgumentsCount = adapterFunction.valueParameters.size
678+
typeArgumentsCount = 0
681679
)
682680
irCall.dispatchReceiver = adapterFunction.extensionReceiverParameter!!.toIrGetValue(startOffset, endOffset)
683681
for (irAdapterParameter in adapterFunction.valueParameters) {

‎compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt

+1-5
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,6 @@ class CallAndReferenceGenerator(
587587
startOffset, endOffset, irType,
588588
declarationStorage.findGetterOfProperty(irSymbol),
589589
typeArgumentsCount = calleeReference.toResolvedCallableSymbol()!!.fir.typeParameters.size,
590-
valueArgumentsCount = 0,
591590
origin = IrStatementOrigin.GET_LOCAL_PROPERTY,
592591
superQualifierSymbol = dispatchReceiver?.superQualifierSymbolForFunctionAndPropertyAccess()
593592
)
@@ -767,7 +766,6 @@ class CallAndReferenceGenerator(
767766
setterSymbol != null -> IrCallImpl(
768767
startOffset, endOffset, type, setterSymbol,
769768
typeArgumentsCount = firProperty.typeParameters.size,
770-
valueArgumentsCount = 1 + firProperty.contextReceivers.size,
771769
origin = origin,
772770
superQualifierSymbol = variableAssignment.dispatchReceiver?.superQualifierSymbolForFunctionAndPropertyAccess()
773771
).apply {
@@ -812,7 +810,6 @@ class CallAndReferenceGenerator(
812810
IrCallImpl(
813811
startOffset, endOffset, type, symbol,
814812
typeArgumentsCount = firFunction?.typeParameters?.size ?: 0,
815-
valueArgumentsCount = 1,
816813
origin = origin
817814
).apply {
818815
putValueArgument(0, irRhsWithCast)
@@ -1243,8 +1240,7 @@ class CallAndReferenceGenerator(
12431240
startOffset, endOffset,
12441241
firConversionFunction.fir.returnTypeRef.toIrType(),
12451242
irConversionFunction,
1246-
typeArgumentsCount = 0,
1247-
valueArgumentsCount = 0
1243+
typeArgumentsCount = 0
12481244
).apply {
12491245
extensionReceiver = this@applyToElement
12501246
}

‎compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/OperatorExpressionGenerator.kt

-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ internal class OperatorExpressionGenerator(
317317
irExpression.startOffset, irExpression.endOffset,
318318
conversionFirFunction.resolvedReturnType.toIrType(c),
319319
conversionFunctionSymbol as IrSimpleFunctionSymbol,
320-
valueArgumentsCount = 0,
321320
typeArgumentsCount = 0
322321
).also {
323322
it.dispatchReceiver = irExpression

‎compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrInlineUtils.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ fun IrInlinable.inline(target: IrDeclarationParent, arguments: List<IrValueDecla
121121
val invoke = invokable.type.getClass()!!.functions.single { it.name == OperatorNameConventions.INVOKE }
122122
IrCallImpl(
123123
UNDEFINED_OFFSET, UNDEFINED_OFFSET, invoke.returnType, invoke.symbol,
124-
typeArgumentsCount = 0, valueArgumentsCount = arguments.size,
124+
typeArgumentsCount = 0,
125125
).apply {
126126
dispatchReceiver = IrGetValueImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, invokable.symbol)
127127
for ((index, argument) in arguments.withIndex()) {

‎compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt

-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ fun CommonBackendContext.createArrayOfExpression(
112112
arrayType,
113113
ir.symbols.arrayOf,
114114
typeArgumentsCount = 1,
115-
valueArgumentsCount = 1
116115
).apply {
117116
putTypeArgument(0, arrayElementType)
118117
putValueArgument(0, arg0)

‎compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt

-1
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ open class DefaultParameterInjector<TContext : CommonBackendContext>(
365365
IrCallImpl(
366366
startOffset, endOffset, (it as IrSimpleFunctionSymbol).owner.returnType, it,
367367
typeArgumentsCount = typeArgumentsCount - typeParametersToRemove,
368-
valueArgumentsCount = it.owner.valueParameters.size,
369368
origin = LoweredStatementOrigins.DEFAULT_DISPATCH_CALL,
370369
superQualifierSymbol = superQualifierSymbol
371370
)

‎compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/EnumWhenLowering.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,7 @@ open class EnumWhenLowering(protected open val context: CommonBackendContext) :
165165
return IrCallImpl(
166166
expression.startOffset, expression.endOffset,
167167
expression.type, expression.symbol,
168-
typeArgumentsCount = 0,
169-
valueArgumentsCount = 2
168+
typeArgumentsCount = 0
170169
).apply {
171170
putValueArgument(0, IrGetValueImpl(lhs.startOffset, lhs.endOffset, subjectOrdinal.type, subjectOrdinal.symbol))
172171
putValueArgument(1, IrConstImpl.int(rhs.startOffset, rhs.endOffset, context.irBuiltIns.intType, entryOrdinal))

‎compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt

-1
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,6 @@ open class LocalDeclarationsLowering(
631631
oldCall.type,
632632
newCallee.symbol,
633633
typeArgumentsCount = newCallee.typeParameters.size,
634-
valueArgumentsCount = newCallee.valueParameters.size,
635634
origin = oldCall.origin,
636635
superQualifierSymbol = oldCall.superQualifierSymbol
637636
).also {

‎compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/SyntheticAccessorGenerator.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ abstract class SyntheticAccessorGenerator<Context : BackendContext, ScopeInfo>(
496496
val call = IrCallImpl(
497497
oldExpression.startOffset, oldExpression.endOffset,
498498
oldExpression.type,
499-
accessorSymbol, 0, accessorSymbol.owner.valueParameters.size,
499+
accessorSymbol, 0,
500500
oldExpression.origin
501501
)
502502
oldExpression.receiver?.let {
@@ -541,7 +541,7 @@ abstract class SyntheticAccessorGenerator<Context : BackendContext, ScopeInfo>(
541541
val call = IrCallImpl(
542542
oldExpression.startOffset, oldExpression.endOffset,
543543
oldExpression.type,
544-
accessorSymbol, 0, accessorSymbol.owner.valueParameters.size,
544+
accessorSymbol, 0,
545545
oldExpression.origin
546546
)
547547
oldExpression.receiver?.let {

‎compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/ProgressionType.kt

+3-6
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,7 @@ internal abstract class UnsignedProgressionType(
124124
startOffset, endOffset,
125125
unsignedType,
126126
unsafeCoerceIntrinsic,
127-
typeArgumentsCount = 2,
128-
valueArgumentsCount = 1
127+
typeArgumentsCount = 2
129128
).apply {
130129
putTypeArgument(0, fromType)
131130
putTypeArgument(1, unsignedType)
@@ -136,8 +135,7 @@ internal abstract class UnsignedProgressionType(
136135
IrCallImpl(
137136
startOffset, endOffset, unsignedConversionFunction.owner.returnType,
138137
unsignedConversionFunction,
139-
typeArgumentsCount = 0,
140-
valueArgumentsCount = 0
138+
typeArgumentsCount = 0
141139
).apply {
142140
extensionReceiver = this@asUnsigned
143141
}
@@ -152,8 +150,7 @@ internal abstract class UnsignedProgressionType(
152150
IrCallImpl(
153151
startOffset, endOffset, toType,
154152
unsafeCoerceIntrinsic,
155-
typeArgumentsCount = 2,
156-
valueArgumentsCount = 1
153+
typeArgumentsCount = 2
157154
).apply {
158155
putTypeArgument(0, unsignedType)
159156
putTypeArgument(1, toType)

‎compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/Utils.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ internal fun IrExpression.negate(): IrExpression {
3838
IrCallImpl(
3939
startOffset, endOffset, unaryMinusFun.returnType,
4040
unaryMinusFun.symbol,
41-
valueArgumentsCount = 0,
4241
typeArgumentsCount = 0
4342
).apply {
4443
dispatchReceiver = this@negate
@@ -61,7 +60,6 @@ internal fun IrExpression.decrement(): IrExpression {
6160
IrCallImpl(
6261
startOffset, endOffset, type,
6362
decFun.symbol,
64-
valueArgumentsCount = 0,
6563
typeArgumentsCount = 0
6664
).apply {
6765
dispatchReceiver = this@decrement
@@ -201,8 +199,7 @@ private fun IrExpression.makeIrCallConversionToTargetClass(
201199
return IrCallImpl(
202200
startOffset, endOffset,
203201
castFun.returnType, castFun.symbol,
204-
typeArgumentsCount = 0,
205-
valueArgumentsCount = 0
202+
typeArgumentsCount = 0
206203
).also { it.dispatchReceiver = this }
207204
}
208205

‎compiler/ir/backend.common/test/org/jetbrains/kotlin/backend/common/IrValidatorTest.kt

-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ class IrValidatorTest {
7979
IrCallImpl(
8080
UNDEFINED_OFFSET, UNDEFINED_OFFSET, TestIrBuiltins.anyType, function.symbol,
8181
typeArgumentsCount = 0,
82-
valueArgumentsCount = 1,
8382
).apply {
8483
dispatchReceiver = stringConcatenationWithWrongType
8584
putValueArgument(0, stringConcatenationWithWrongType)
@@ -105,7 +104,6 @@ class IrValidatorTest {
105104
IrCallImpl(
106105
6, 23, TestIrBuiltins.anyType, function.symbol,
107106
typeArgumentsCount = 0,
108-
valueArgumentsCount = 1,
109107
).apply {
110108
dispatchReceiver = stringConcatenationWithWrongType
111109
putValueArgument(0, stringConcatenationWithWrongType)

‎compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsSharedVariablesManager.kt

-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
1717
import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
1818
import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
1919
import org.jetbrains.kotlin.ir.symbols.IrValueSymbol
20-
import org.jetbrains.kotlin.ir.symbols.IrVariableSymbol
2120

2221
class JsSharedVariablesManager(context: JsIrBackendContext) : SharedVariablesManager {
2322

@@ -39,7 +38,6 @@ class JsSharedVariablesManager(context: JsIrBackendContext) : SharedVariablesMan
3938
IrCallImpl(
4039
initializer.startOffset, initializer.endOffset,
4140
dynamicType, createBox,
42-
valueArgumentsCount = 1,
4341
typeArgumentsCount = 1
4442
).apply {
4543
putTypeArgument(0, valueType)
@@ -68,7 +66,6 @@ class JsSharedVariablesManager(context: JsIrBackendContext) : SharedVariablesMan
6866
originalGet.type,
6967
readBox,
7068
typeArgumentsCount = 1,
71-
valueArgumentsCount = 1,
7269
originalGet.origin
7370
).apply {
7471
putTypeArgument(0, originalGet.type)
@@ -91,7 +88,6 @@ class JsSharedVariablesManager(context: JsIrBackendContext) : SharedVariablesMan
9188
builtIns.unitType,
9289
writeBox,
9390
typeArgumentsCount = 1,
94-
valueArgumentsCount = 2,
9591
originalSet.origin
9692
).apply {
9793
putTypeArgument(0, originalSet.value.type)

‎compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/ir/IrBuilder.kt

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ object JsIrBuilder {
3636
target,
3737
superQualifierSymbol = superQualifierSymbol,
3838
typeArgumentsCount = owner.typeParameters.size,
39-
valueArgumentsCount = owner.valueParameters.size,
4039
origin = origin
4140
).apply {
4241
typeArguments?.let {

‎compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt

-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ class CallableReferenceLowering(private val context: JsCommonBackendContext) : B
331331
callee.returnType,
332332
callee.symbol,
333333
callee.typeParameters.size,
334-
callee.valueParameters.size,
335334
JsStatementOrigins.CALLABLE_REFERENCE_INVOKE
336335
)
337336
}

‎compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CreateScriptFunctionsPhase.kt

-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ class CreateScriptFunctionsPhase(val context: CommonBackendContext) : FileLoweri
142142
return IrCallImpl(
143143
UNDEFINED_OFFSET, UNDEFINED_OFFSET, function.returnType,
144144
function.symbol,
145-
valueArgumentsCount = function.valueParameters.size,
146145
typeArgumentsCount = function.typeParameters.size
147146
)
148147
}

‎compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/EscapedIdentifiersLowering.kt

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ class EscapedIdentifiersLowering(context: JsIrBackendContext) : BodyLoweringPass
5050
type = context.dynamicType,
5151
symbol = context.intrinsics.globalThis.owner.getter!!.symbol,
5252
typeArgumentsCount = 0,
53-
valueArgumentsCount = 0,
5453
)
5554

5655
private val IrFunction.dummyDispatchReceiverParameter

‎compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/InteropCallableReferenceLowering.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ class InteropCallableReferenceLowering(val context: JsIrBackendContext) : BodyLo
100100
UNDEFINED_OFFSET,
101101
context.irBuiltIns.anyType,
102102
context.intrinsics.jsBind,
103-
valueArgumentsCount = 2,
104103
typeArgumentsCount = 0,
105104
origin = JsStatementOrigins.BIND_CALL,
106105
).apply {
@@ -170,7 +169,7 @@ class InteropCallableReferenceLowering(val context: JsIrBackendContext) : BodyLo
170169
factory: IrSimpleFunctionSymbol
171170
): IrCall {
172171
val newCall = expression.run {
173-
IrCallImpl(startOffset, endOffset, type, factory, typeArgumentsCount, valueArgumentsCount, origin)
172+
IrCallImpl(startOffset, endOffset, type, factory, typeArgumentsCount, origin)
174173
}
175174

176175
newCall.dispatchReceiver = expression.dispatchReceiver
@@ -434,7 +433,6 @@ class InteropCallableReferenceLowering(val context: JsIrBackendContext) : BodyLo
434433
invokeFun.returnType,
435434
invokeFun.symbol,
436435
typeArgumentsCount = 0,
437-
valueArgumentsCount = invokeFun.valueParameters.size,
438436
origin = JsStatementOrigins.EXPLICIT_INVOKE,
439437
superQualifierSymbol = null
440438
)

‎compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/InvokeStaticInitializersLowering.kt

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class InvokeStaticInitializersLowering(val context: JsCommonBackendContext) : Bo
3535
context.irBuiltIns.unitType,
3636
instance.symbol,
3737
typeArgumentsCount = 0,
38-
valueArgumentsCount = 0,
3938
origin = JsStatementOrigins.SYNTHESIZED_STATEMENT
4039
)
4140

‎compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsDefaultParameterInjector.kt

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ class JsDefaultParameterInjector(context: JsIrBackendContext) :
8080
context.dynamicType,
8181
context.intrinsics.jsPrototypeOfSymbol,
8282
typeArgumentsCount = 0,
83-
valueArgumentsCount = 1
8483
).apply {
8584
putValueArgument(0, owner.jsConstructorReference(context))
8685
}

‎compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/PrivateMembersLowering.kt

-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ class PrivateMemberBodiesLowering(val context: JsIrBackendContext) : BodyLowerin
187187
expression.type,
188188
staticTarget.symbol,
189189
typeArgumentsCount = expression.typeArgumentsCount,
190-
valueArgumentsCount = expression.valueArgumentsCount + 1,
191190
origin = expression.origin,
192191
superQualifierSymbol = expression.superQualifierSymbol
193192
)

‎compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/PropertyReferenceLowering.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ class PropertyReferenceLowering(private val context: JsIrBackendContext) : BodyL
194194
val irCall = IrCallImpl(
195195
startOffset, endOffset, jsClassSymbol.owner.returnType, jsClassSymbol,
196196
typeArgumentsCount = 1,
197-
valueArgumentsCount = 0,
198197
)
199198
irCall.putTypeArgument(0, type)
200199
return irCall
@@ -212,8 +211,7 @@ class PropertyReferenceLowering(private val context: JsIrBackendContext) : BodyL
212211
expression.endOffset,
213212
expression.type,
214213
factoryFunction.symbol,
215-
expression.typeArgumentsCount,
216-
factoryFunction.valueParameters.size
214+
expression.typeArgumentsCount
217215
).apply {
218216
for (ti in 0 until typeArgumentsCount) {
219217
putTypeArgument(ti, expression.getTypeArgument(ti))
@@ -229,7 +227,7 @@ class PropertyReferenceLowering(private val context: JsIrBackendContext) : BodyL
229227
expression.transformChildrenVoid(this)
230228

231229
val builderCall = expression.run {
232-
IrCallImpl(startOffset, endOffset, type, localDelegateBuilderSymbol, typeArgumentsCount, valueArgumentsCount = 4)
230+
IrCallImpl(startOffset, endOffset, type, localDelegateBuilderSymbol, typeArgumentsCount)
233231
}
234232

235233
val localName = expression.symbol.owner.name.asString()

‎compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt

-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@ private class CallsiteRedirectionTransformer(private val context: JsIrBackendCon
312312
return IrCallImpl(
313313
call.startOffset, call.endOffset, call.type, newTarget,
314314
typeArgumentsCount = call.typeArgumentsCount,
315-
valueArgumentsCount = newTarget.owner.valueParameters.size,
316315
superQualifierSymbol = irClass.symbol.takeIf { context.es6mode && call.isSyntheticDelegatingReplacement }
317316
).apply {
318317
copyTypeArgumentsFrom(call)

‎compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ThrowableLowering.kt

-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ class ThrowableLowering(val context: JsIrBackendContext, val extendThrowableFunc
7272
return expression.run {
7373
IrCallImpl(
7474
startOffset, endOffset, type, newThrowableFunction,
75-
valueArgumentsCount = 2,
7675
typeArgumentsCount = 0
7776
).also {
7877
it.putValueArgument(0, messageArg)
@@ -93,7 +92,6 @@ class ThrowableLowering(val context: JsIrBackendContext, val extendThrowableFunc
9392
val expressionReplacement = expression.run {
9493
IrCallImpl(
9594
startOffset, endOffset, type, extendThrowableFunction,
96-
valueArgumentsCount = 3,
9795
typeArgumentsCount = 0
9896
).also {
9997
it.putValueArgument(0, thisReceiver)

0 commit comments

Comments
 (0)