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

Adapt to change in master

Browse Source 
(cherry picked from commit 0f812ca24c5c570a5015297bfec744145e8d0e25)
This commit is contained in:
Georgy Bronnikov
2020-09-19 17:36:16 +03:00
committed by Vasily Levchenko
parent 1e7b39ef80
commit ad39f45304
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt
+2 -1
View File
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.ir.types.getClass
import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.ir.util.irCall import org.jetbrains.kotlin.ir.util.irCall
import org.jetbrains.kotlin.psi2ir.generators.GeneratorContext 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. * 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) irCall.dispatchReceiver = irGet(values)
} }
val getElementFn = symbols.arrayGet.getValue(arrayClass) 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) val lessFunctionSymbol = irBuiltIns.lessFunByOperandType.getValue(irBuiltIns.intClass)
+irWhile().also { loop -> +irWhile().also { loop ->
loop.condition = irCall(lessFunctionSymbol, irBuiltIns.booleanType).also { irCall -> loop.condition = irCall(lessFunctionSymbol, irBuiltIns.booleanType).also { irCall ->
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt
+3 -1
View File
@@ -147,7 +147,9 @@ internal class VarargInjectionLowering constructor(val context: KonanBackendCont
} }
private val symbols = context.ir.symbols 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 { private fun arrayType(type: IrType): ArrayHandle {
val arrayClass = type.classifierOrFail val arrayClass = type.classifierOrFail