From 7156200953f77bbb456afa81f70046c96381b0d3 Mon Sep 17 00:00:00 2001 From: Artem Kobzar Date: Thu, 12 Jan 2023 21:15:01 +0000 Subject: [PATCH] [K/JS] serialize enum entries as a byte instead of int --- .../js/utils/serialization/JsIrAstDeserializer.kt | 8 ++++---- .../js/utils/serialization/JsIrAstSerializer.kt | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstDeserializer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstDeserializer.kt index 93882288d99..7584f445884 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstDeserializer.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstDeserializer.kt @@ -298,16 +298,16 @@ private class JsIrAstDeserializer(private val source: ByteArray) { } BINARY_OPERATION -> { JsBinaryOperation( - jsBinaryOperatorValues[readInt()], + jsBinaryOperatorValues[readByte().toInt()], readExpression(), readExpression() ) } PREFIX_OPERATION -> { - JsPrefixOperation(jsUnaryOperatorValues[readInt()], readExpression()) + JsPrefixOperation(jsUnaryOperatorValues[readByte().toInt()], readExpression()) } POSTFIX_OPERATION -> { - JsPostfixOperation(jsUnaryOperatorValues[readInt()], readExpression()) + JsPostfixOperation(jsUnaryOperatorValues[readByte().toInt()], readExpression()) } CONDITIONAL -> { JsConditional( @@ -348,7 +348,7 @@ private class JsIrAstDeserializer(private val source: ByteArray) { } }.apply { synthetic = readBoolean() - sideEffects = sideEffectKindValues[readInt()] + sideEffects = sideEffectKindValues[readByte().toInt()] ifTrue { localAlias = readJsImportedModule() } } } diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstSerializer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstSerializer.kt index b2606e897eb..c303111b3f0 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstSerializer.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstSerializer.kt @@ -412,20 +412,20 @@ private class JsIrAstSerializer { override fun visitBinaryExpression(x: JsBinaryOperation) { writeByte(ExpressionIds.BINARY_OPERATION) - writeInt(x.operator.ordinal) + writeByte(x.operator.ordinal) writeExpression(x.arg1) writeExpression(x.arg2) } override fun visitPrefixOperation(x: JsPrefixOperation) { writeByte(ExpressionIds.PREFIX_OPERATION) - writeInt(x.operator.ordinal) + writeByte(x.operator.ordinal) writeExpression(x.arg) } override fun visitPostfixOperation(x: JsPostfixOperation) { writeByte(ExpressionIds.POSTFIX_OPERATION) - writeInt(x.operator.ordinal) + writeByte(x.operator.ordinal) writeExpression(x.arg) } @@ -484,7 +484,7 @@ private class JsIrAstSerializer { } writeBoolean(expression.synthetic) - writeInt(expression.sideEffects.ordinal) + writeByte(expression.sideEffects.ordinal) ifNotNull(expression.localAlias) { writeImportedModule(it) } } @@ -528,7 +528,7 @@ private class JsIrAstSerializer { writeBoolean(name.isTemporary) ifNotNull(name.localAlias) { writeLocalAlias(it) } writeBoolean(name.imported && name !in importedNames) - ifNotNull(name.specialFunction) { writeInt(it.ordinal) } + ifNotNull(name.specialFunction) { writeByte(it.ordinal) } } nameMap.size }