From 962172f96d047d2a4101efbe4a4499acda057375 Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Tue, 15 Aug 2023 14:46:56 +0200 Subject: [PATCH] [Native] Drop `irSetVar` from `IrUtils2` We can reuse `irSet` function --- .../konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt | 2 +- .../backend/konan/lower/NativeSuspendFunctionLowering.kt | 2 +- .../src/org/jetbrains/kotlin/ir/util/IrUtils2.kt | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt index 5374f2f94b0..4e08a6b1ead 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt @@ -82,7 +82,7 @@ internal class CEnumByValueFunctionGenerator( type = irBuiltIns.unitType, condition = irEquals(entryValue, irGet(irValueParameter)), thenPart = irReturn(irGet(entry)), - elsePart = irSetVar( + elsePart = irSet( inductionVariable, irCallOp(plusFun, irBuiltIns.intType, irGet(inductionVariable), diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt index 1c9500e3adf..edf9a940a5d 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt @@ -159,7 +159,7 @@ internal class NativeSuspendFunctionsLowering( val scope = liveLocals[suspensionPoint]!! return irBlock(expression) { scope.forEach { - +irSetVar(localsMap[it] + +irSet(localsMap[it] ?: it, irGetField(irGet(thisReceiver), localToPropertyMap[it.symbol]!!)) } } 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 c2c083d3fa1..bad43fbf529 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 @@ -173,9 +173,6 @@ fun IrBuilderWithScope.irCallOp( putValueArgument(0, argument) } -fun IrBuilderWithScope.irSetVar(variable: IrVariable, value: IrExpression) = - irSet(variable.symbol, value) - fun IrBuilderWithScope.irCatch(type: IrType) = IrCatchImpl( startOffset, endOffset,