From ddde95bd78deba944b73ef68040bf030a918e06a Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Wed, 16 Aug 2023 11:45:47 +0200 Subject: [PATCH] [Native] Move `irByte` from `IrUtils2` We already have similar functions in `ExpressionHelpers`. Makes sense to keep them together. --- .../org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt | 6 ++++++ .../src/org/jetbrains/kotlin/ir/util/IrUtils2.kt | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt index 8c676f114a5..2f0a1237874 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt @@ -345,6 +345,12 @@ fun IrBuilderWithScope.irReinterpretCast(argument: IrExpression, type: IrType) = fun IrBuilderWithScope.irSamConversion(argument: IrExpression, type: IrType) = typeOperator(type, argument, IrTypeOperator.SAM_CONVERSION, type) +fun IrBuilderWithScope.irByte(value: Byte) = + IrConstImpl.byte(startOffset, endOffset, context.irBuiltIns.byteType, value) + +fun IrBuilderWithScope.irShort(value: Short) = + IrConstImpl.short(startOffset, endOffset, context.irBuiltIns.shortType, value) + fun IrBuilderWithScope.irInt(value: Int, type: IrType = context.irBuiltIns.intType) = IrConstImpl.int(startOffset, endOffset, type, value) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt index c814cf6205a..908717ceff7 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt @@ -32,8 +32,5 @@ fun IrBuilderWithScope.irCatch() = ) ) -fun IrBuilderWithScope.irByte(value: Byte) = - IrConstImpl.byte(startOffset, endOffset, context.irBuiltIns.byteType, value) - val IrField.hasNonConstInitializer: Boolean get() = initializer?.expression.let { it != null && it !is IrConst<*> && it !is IrConstantValue }