Skip to content

Commit f97bdcb

Browse files
mcpiromangoodwinnk
authored andcommitted
[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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 3 deletions
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

Lines changed: 1 addition & 5 deletions
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 0 additions & 1 deletion
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 {

0 commit comments

Comments
 (0)