From 7bd5031eafe3f93c25ebab37efc5a830c38be621 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Thu, 28 Jun 2018 14:22:42 +0300 Subject: [PATCH] Fix array check (cherry picked from commit e662f82) --- .../kotlin/backend/jvm/codegen/ExpressionCodegen.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt index e2c8d3d24c3..bacf6682d37 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt @@ -23,10 +23,12 @@ import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor import org.jetbrains.kotlin.ir.IrElement -import org.jetbrains.kotlin.ir.declarations.* +import org.jetbrains.kotlin.ir.declarations.IrClass +import org.jetbrains.kotlin.ir.declarations.IrFunction +import org.jetbrains.kotlin.ir.declarations.IrTypeAlias +import org.jetbrains.kotlin.ir.declarations.IrVariable import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.symbols.IrSymbol -import org.jetbrains.kotlin.ir.types.isArray import org.jetbrains.kotlin.ir.types.toKotlinType import org.jetbrains.kotlin.ir.util.dump import org.jetbrains.kotlin.ir.util.render @@ -442,7 +444,7 @@ class ExpressionCodegen( val hasSpread = arguments.firstIsInstanceOrNull() != null if (hasSpread) { - val arrayOfReferences = outType.isArray() + val arrayOfReferences = KotlinBuiltIns.isArray(outType.toKotlinType()!!) if (size == 1) { // Arrays.copyOf(receiverValue, newLength) val argument = (arguments[0] as IrSpreadElement).expression