From 10ca3dbeca4f00f394122655bb96ffb81fd82585 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Fri, 9 Jun 2017 11:43:17 +0200 Subject: [PATCH] Use isPrimitiveType instead of isValueType in LateinitLowering assertion --- .../jetbrains/kotlin/backend/konan/lower/LateinitLowering.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/LateinitLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/LateinitLowering.kt index 33665a4a9e7..61dc734225a 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/LateinitLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/LateinitLowering.kt @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.backend.konan.lower import org.jetbrains.kotlin.backend.common.CommonBackendContext import org.jetbrains.kotlin.backend.common.FileLoweringPass import org.jetbrains.kotlin.backend.common.lower.createIrBuilder -import org.jetbrains.kotlin.backend.konan.isValueType import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.builders.* import org.jetbrains.kotlin.ir.declarations.IrFile @@ -45,7 +45,7 @@ internal class LateinitLowering(val context: CommonBackendContext): FileLowering private fun transformGetter(backingFieldSymbol: IrFieldSymbol, getter: IrFunction) { val type = backingFieldSymbol.descriptor.type - assert (!type.isValueType(), { "'lateinit' modifier is not allowed on value types" }) + assert (!KotlinBuiltIns.isPrimitiveType(type), { "'lateinit' modifier is not allowed on primitive types" }) val startOffset = getter.startOffset val endOffset = getter.endOffset val irBuilder = context.createIrBuilder(getter.symbol, startOffset, endOffset)