azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR2IR: simplify applyAssigningArrayElementsToVarargInNamedForm a bit

Browse Source
This commit is contained in:
Mikhail Glukhikh
2023-11-13 08:56:24 +01:00
committed by Space Team
parent 4913c38e98
commit e747793e62
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt
+5 -11
View File
@@ -1065,20 +1065,14 @@ class CallAndReferenceGenerator(
argument: FirExpression, argument: FirExpression,
parameter: FirValueParameter?, parameter: FirValueParameter?,
): IrExpression { ): IrExpression {
if (this !is IrVarargImpl || if (this is IrVararg && parameter?.isVararg == true && argument is FirVarargArgumentsExpression && elements.size == 1) {
parameter?.isVararg != true || val irVarargElement = elements[0]
argument !is FirVarargArgumentsExpression || if (argument.arguments[0] is FirNamedArgumentExpression &&
argument.arguments.none { it is FirNamedArgumentExpression } // IrVarargElement can be either IrSpreadElement (then nothing to do) or IrExpression
) {
return this
}
elements.forEachIndexed { i, irVarargElement ->
if (irVarargElement !is IrSpreadElement &&
argument.arguments[i] is FirNamedArgumentExpression &&
irVarargElement is IrExpression && irVarargElement is IrExpression &&
(irVarargElement.type.isArray() || irVarargElement.type.isPrimitiveArray()) (irVarargElement.type.isArray() || irVarargElement.type.isPrimitiveArray())
) { ) {
elements[i] = IrSpreadElementImpl(irVarargElement.startOffset, irVarargElement.endOffset, irVarargElement) elements[0] = IrSpreadElementImpl(irVarargElement.startOffset, irVarargElement.endOffset, irVarargElement)
} }
} }
return this return this