From b5f43d6e6c57c6b5c083b73ec67689d22c7fac4a Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Wed, 15 Feb 2017 15:22:04 +0300 Subject: [PATCH] IR: primitive varargs: boolean --- .../backend/konan/lower/VarargLowering.kt | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt index 3aa2539871d..bd44bab335a 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt @@ -148,14 +148,15 @@ class VarargInjectionLowering internal constructor(val context: Context): Functi private fun arrayType(type: KotlinType): ArrayHandle { return when { - KotlinBuiltIns.isByte(type) -> kByteArrayHandler - KotlinBuiltIns.isShort(type) -> kShortArrayHandler - KotlinBuiltIns.isChar(type) -> kCharArrayHandler - KotlinBuiltIns.isInt(type) -> kIntArrayHandler - KotlinBuiltIns.isLong(type) -> kLongArrayHandler - KotlinBuiltIns.isFloat(type) -> kFloatArrayHandler - KotlinBuiltIns.isDouble(type) -> kDoubleArrayHandler - else -> kArrayHandler + KotlinBuiltIns.isByte(type) -> kByteArrayHandler + KotlinBuiltIns.isShort(type) -> kShortArrayHandler + KotlinBuiltIns.isChar(type) -> kCharArrayHandler + KotlinBuiltIns.isInt(type) -> kIntArrayHandler + KotlinBuiltIns.isLong(type) -> kLongArrayHandler + KotlinBuiltIns.isFloat(type) -> kFloatArrayHandler + KotlinBuiltIns.isDouble(type) -> kDoubleArrayHandler + KotlinBuiltIns.isBoolean(type) -> kBooleanArrayHandler + else -> kArrayHandler } } @@ -205,15 +206,16 @@ class VarargInjectionLowering internal constructor(val context: Context): Functi val setMethodDescriptor: FunctionDescriptor, val sizeDescriptor:DeclarationDescriptor, val copyRangeToDescriptor:FunctionDescriptor) - val kKotlinPackage = context.builtIns.builtInsModule.getPackage(FqName("kotlin")) - val kByteArrayHandler = handle(arrayClassDescriptor("ByteArray")) - val kCharArrayHandler = handle(arrayClassDescriptor("CharArray")) - val kShortArrayHandler = handle(arrayClassDescriptor("ShortArray")) - val kIntArrayHandler = handle(arrayClassDescriptor("IntArray")) - val kLongArrayHandler = handle(arrayClassDescriptor("LongArray")) - val kFloatArrayHandler = handle(arrayClassDescriptor("FloatArray")) - val kDoubleArrayHandler = handle(arrayClassDescriptor("DoubleArray")) - val kArrayHandler = handle(context.builtIns.array) + val kKotlinPackage = context.builtIns.builtInsModule.getPackage(FqName("kotlin")) + val kByteArrayHandler = handle(arrayClassDescriptor("ByteArray")) + val kCharArrayHandler = handle(arrayClassDescriptor("CharArray")) + val kShortArrayHandler = handle(arrayClassDescriptor("ShortArray")) + val kIntArrayHandler = handle(arrayClassDescriptor("IntArray")) + val kLongArrayHandler = handle(arrayClassDescriptor("LongArray")) + val kFloatArrayHandler = handle(arrayClassDescriptor("FloatArray")) + val kDoubleArrayHandler = handle(arrayClassDescriptor("DoubleArray")) + val kBooleanArrayHandler = handle(arrayClassDescriptor("BooleanArray")) + val kArrayHandler = handle(context.builtIns.array) val kInt = context.builtIns.int val kIntType = context.builtIns.intType