Adapt to change in master
(cherry picked from commit 0f812ca24c5c570a5015297bfec744145e8d0e25)
This commit is contained in:
committed by
Vasily Levchenko
parent
1e7b39ef80
commit
ad39f45304
+2
-1
@@ -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 ->
|
||||
|
||||
+3
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user