azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix project compilation after fix for KT-35920

Browse Source 
See KT-35931 for a feature request allowing to write IrConstImpl::int
This commit is contained in:
Denis Zharkov
2020-01-15 12:24:06 +03:00
parent d4c34afb94
commit bcad6aeda6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ConstLowering.kt
+5 -5
View File
@@ -40,17 +40,17 @@ class ConstTransformer(private val context: JsIrBackendContext) : IrElementTrans
} }
private fun createLong(v: Long): IrExpression = 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 <T> visitConst(expression: IrConst<T>): IrExpression { override fun <T> visitConst(expression: IrConst<T>): IrExpression {
with(context.intrinsics) { with(context.intrinsics) {
if (expression.type.isUnsigned()) { if (expression.type.isUnsigned()) {
return when (expression.type.classifierOrNull) { 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)) uLongClassSymbol -> lowerConst(uLongClassSymbol, { _, _, _, v -> createLong(v) }, IrConstKind.Long.valueOf(expression))
@@ -59,7 +59,7 @@ class ConstTransformer(private val context: JsIrBackendContext) : IrElementTrans
} }
return when { return when {
expression.kind is IrConstKind.Char -> 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 -> expression.kind is IrConstKind.Long ->
createLong(IrConstKind.Long.valueOf(expression)) createLong(IrConstKind.Long.valueOf(expression))