From 27adfa8370f47902e2951cc2abf8c1e36194188f Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Fri, 6 Jan 2023 13:01:44 +0100 Subject: [PATCH] [FIR] Provide the correct type parameters when building arrayOf function --- .../org/jetbrains/kotlin/fir/backend/IrBuiltInsOverFir.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 index ecba08cc0c8..81dd8a751d4 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/IrBuiltInsOverFir.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/IrBuiltInsOverFir.kt @@ -537,13 +537,14 @@ class IrBuiltInsOverFir( val kotlinKt = kotlinIrPackage.createClass(kotlinPackage.child(Name.identifier("KotlinKt"))) KotlinPackageFuns( arrayOf = kotlinKt.addPackageFun("arrayOf", arrayClass.defaultType) arrayOf@{ - addTypeParameter("T", anyNType) + val typeParameter = addTypeParameter("T", anyNType) addValueParameter { this.name = Name.identifier("elements") - this.type = arrayClass.defaultType - this.varargElementType = typeParameters[0].defaultType + this.type = arrayClass.typeWithParameters(listOf(typeParameter)) + this.varargElementType = typeParameter.defaultType this.origin = this@arrayOf.origin } + returnType = arrayClass.typeWithParameters(listOf(typeParameter)) } ) }