From bcad6aeda61c6a524fa3ec9e3d88f579e752e923 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 15 Jan 2020 12:24:06 +0300 Subject: [PATCH] Fix project compilation after fix for KT-35920 See KT-35931 for a feature request allowing to write IrConstImpl::int --- .../kotlin/ir/backend/js/lower/ConstLowering.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ConstLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ConstLowering.kt index 726677f6c8b..e7b9f195fb6 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ConstLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ConstLowering.kt @@ -40,17 +40,17 @@ class ConstTransformer(private val context: JsIrBackendContext) : IrElementTrans } private fun createLong(v: Long): IrExpression = - lowerConst(context.intrinsics.longClassSymbol, IrConstImpl<*>::int, v.toInt(), (v shr 32).toInt()) + lowerConst(context.intrinsics.longClassSymbol, IrConstImpl.Companion::int, v.toInt(), (v shr 32).toInt()) override fun visitConst(expression: IrConst): IrExpression { with(context.intrinsics) { if (expression.type.isUnsigned()) { return when (expression.type.classifierOrNull) { - uByteClassSymbol -> lowerConst(uByteClassSymbol, IrConstImpl<*>::byte, IrConstKind.Byte.valueOf(expression)) + uByteClassSymbol -> lowerConst(uByteClassSymbol, IrConstImpl.Companion::byte, IrConstKind.Byte.valueOf(expression)) - uShortClassSymbol -> lowerConst(uShortClassSymbol, IrConstImpl<*>::short, IrConstKind.Short.valueOf(expression)) + uShortClassSymbol -> lowerConst(uShortClassSymbol, IrConstImpl.Companion::short, IrConstKind.Short.valueOf(expression)) - uIntClassSymbol -> lowerConst(uIntClassSymbol, IrConstImpl<*>::int, IrConstKind.Int.valueOf(expression)) + uIntClassSymbol -> lowerConst(uIntClassSymbol, IrConstImpl.Companion::int, IrConstKind.Int.valueOf(expression)) uLongClassSymbol -> lowerConst(uLongClassSymbol, { _, _, _, v -> createLong(v) }, IrConstKind.Long.valueOf(expression)) @@ -59,7 +59,7 @@ class ConstTransformer(private val context: JsIrBackendContext) : IrElementTrans } return when { expression.kind is IrConstKind.Char -> - lowerConst(charClassSymbol, IrConstImpl<*>::int, IrConstKind.Char.valueOf(expression).toInt()) + lowerConst(charClassSymbol, IrConstImpl.Companion::int, IrConstKind.Char.valueOf(expression).toInt()) expression.kind is IrConstKind.Long -> createLong(IrConstKind.Long.valueOf(expression)) @@ -74,4 +74,4 @@ class ConstLowering(private val context: JsIrBackendContext) : FileLoweringPass override fun lower(irFile: IrFile) { irFile.transformChildrenVoid(ConstTransformer(context)) } -} \ No newline at end of file +}