From 0cac6b66d5c44adac2bb687ad73cc0f9ebecec27 Mon Sep 17 00:00:00 2001 From: Kirill Rakhman Date: Fri, 8 Mar 2024 13:52:13 +0100 Subject: [PATCH] [FIR] Remove vararg workaround in FirArgumentsToParametersMapper Since we save the unresolved argument list, we don't need the workaround anymore. #KT-66124 --- .../calls/FirArgumentsToParametersMapper.kt | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirArgumentsToParametersMapper.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirArgumentsToParametersMapper.kt index 4ee60886a92..b947f871dd1 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirArgumentsToParametersMapper.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirArgumentsToParametersMapper.kt @@ -135,19 +135,7 @@ private class FirCallArgumentsProcessor( fun processNonLambdaArguments(arguments: List) { for ((argumentIndex, argument) in arguments.withIndex()) { - if (argument is FirVarargArgumentsExpression) { - // If the argument list was already resolved, any arguments for a vararg parameter will be in a FirVarargArgumentsExpression. - // This can happen when getting all the candidates for an already resolved function call. - val varargArguments = argument.arguments - for ((varargArgumentIndex, varargArgument) in varargArguments.withIndex()) { - processNonLambdaArgument( - varargArgument, - isLastArgument = argumentIndex == arguments.lastIndex && varargArgumentIndex == varargArguments.lastIndex - ) - } - } else { - processNonLambdaArgument(argument, isLastArgument = argumentIndex == arguments.lastIndex) - } + processNonLambdaArgument(argument, isLastArgument = argumentIndex == arguments.lastIndex) } if (state == State.VARARG_POSITION) { completeVarargPositionArguments()