From ad39f45304a1d921c7ccd9047e14ef460e2770bc Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Sat, 19 Sep 2020 17:36:16 +0300 Subject: [PATCH] Adapt to change in master (cherry picked from commit 0f812ca24c5c570a5015297bfec744145e8d0e25) --- .../konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt | 3 ++- .../jetbrains/kotlin/backend/konan/lower/VarargLowering.kt | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt index c7adb9171e9..d3c0f0541ee 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt @@ -18,6 +18,7 @@ import org.jetbrains.kotlin.ir.types.getClass import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.util.irCall import org.jetbrains.kotlin.psi2ir.generators.GeneratorContext +import org.jetbrains.kotlin.util.OperatorNameConventions /** * Generate IR for function that returns appropriate enum entry for the provided integral value. @@ -58,7 +59,7 @@ internal class CEnumByValueFunctionGenerator( irCall.dispatchReceiver = irGet(values) } val getElementFn = symbols.arrayGet.getValue(arrayClass) - val plusFun = symbols.intPlusInt + val plusFun = symbols.getBinaryOperator(OperatorNameConventions.PLUS, irBuiltIns.intType, irBuiltIns.intType) val lessFunctionSymbol = irBuiltIns.lessFunByOperandType.getValue(irBuiltIns.intClass) +irWhile().also { loop -> loop.condition = irCall(lessFunctionSymbol, irBuiltIns.booleanType).also { irCall -> diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt index 3bb0d54a6c8..e239c429a64 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt @@ -147,7 +147,9 @@ internal class VarargInjectionLowering constructor(val context: KonanBackendCont } private val symbols = context.ir.symbols - private val intPlusInt = symbols.intPlusInt.owner + private val intPlusInt = symbols.getBinaryOperator( + OperatorNameConventions.PLUS, context.irBuiltIns.intType, context.irBuiltIns.intType + ).owner private fun arrayType(type: IrType): ArrayHandle { val arrayClass = type.classifierOrFail