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

IR: adapt to introduction of IrSimpleFunction.isInfix

Browse Source 
(cherry picked from commit 4fe73234d810150fd2ebce2fd6963e99e597e37d)
This commit is contained in:
Georgy Bronnikov
2020-07-17 18:07:13 +03:00
committed by Vasily Levchenko
parent baa8354f37
commit 4739209850
14 changed files with 38 additions and 20 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/Boxing.kt
+4 -2
View File
@@ -74,7 +74,8 @@ internal val Context.getBoxFunction: (IrClass) -> IrSimpleFunction by Context.la
isSuspend = false,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).also { function ->
function.valueParameters = listOf(WrappedValueParameterDescriptor().let {
IrValueParameterImpl(
@@ -128,7 +129,8 @@ internal val Context.getUnboxFunction: (IrClass) -> IrSimpleFunction by Context.
isSuspend = false,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).also { function ->
function.valueParameters = listOf(WrappedValueParameterDescriptor().let {
IrValueParameterImpl(
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/BuiltInFictitiousFunctionIrClassFactory.kt
+3 -2
View File
@@ -144,7 +144,7 @@ internal class BuiltInFictitiousFunctionIrClassFactory(
with(descriptor) {
IrFunctionImpl(
SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, origin, it, name, visibility, modality, returnType,
isInline, isExternal, isTailrec, isSuspend, isOperator, isExpect
isInline, isExternal, isTailrec, isSuspend, isOperator, isInfix, isExpect
)
}
}
@@ -289,7 +289,8 @@ internal class BuiltInFictitiousFunctionIrClassFactory(
descriptor.run {
IrFunctionImpl(
offset, offset, memberOrigin, s, name, visibility, modality, returnType,
isInline, isExternal, isTailrec, isSuspend, isOperator, isExpect, true
isInline, isExternal, isTailrec, isSuspend, isOperator, isInfix, isExpect,
isFakeOverride = true
)
}
}
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt
+2 -1
View File
@@ -148,7 +148,8 @@ internal class SpecialDeclarationsFactory(val context: Context) {
returnType = returnType,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).apply {
val bridge = this
descriptor.bind(bridge)
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EntryPoint.kt
+2 -1
View File
@@ -42,7 +42,8 @@ internal fun makeEntryPoint(context: Context): IrFunction {
isSuspend = false,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).also { function ->
function.valueParameters = listOf(WrappedValueParameterDescriptor().let {
IrValueParameterImpl(
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt
+2 -1
View File
@@ -99,7 +99,8 @@ internal class EnumSpecialDeclarationsFactory(val context: Context) {
isSuspend = false,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).apply {
it.bind(this)
parent = implObject
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt
+3 -2
View File
@@ -576,7 +576,8 @@ private fun KotlinStubs.createFakeKotlinExternalFunction(
isSuspend = false,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
)
bridgeDescriptor.bind(bridge)
@@ -1283,7 +1284,7 @@ private class ObjCBlockPointerValuePassing(
Visibilities.PUBLIC, Modality.FINAL,
returnType = functionType.arguments.last().typeOrNull!!,
isInline = false, isExternal = false, isTailrec = false, isSuspend = false, isExpect = false,
isFakeOverride = false, isOperator = false
isFakeOverride = false, isOperator = false, isInfix = false
)
invokeMethodDescriptor.bind(invokeMethod)
invokeMethod.overriddenSymbols += overriddenInvokeMethod.symbol
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGenUtils.kt
+2 -1
View File
@@ -123,7 +123,8 @@ private fun createKotlinBridge(
isSuspend = false,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
)
bridgeDescriptor.bind(bridge)
if (isExternal) {
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt
+2 -1
View File
@@ -509,7 +509,8 @@ private val Context.getLoweredInlineClassConstructor: (IrConstructor) -> IrSimpl
returnType = irConstructor.returnType,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).apply {
descriptor.bind(this)
parent = irConstructor.parent
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BridgesBuilding.kt
+2 -1
View File
@@ -82,7 +82,8 @@ internal class WorkersBridgesBuilding(val context: Context) : DeclarationContain
returnType = context.irBuiltIns.anyNType,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).apply {
it.bind(this)
}
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt
+2 -1
View File
@@ -322,7 +322,8 @@ internal class CallableReferenceLowering(val context: Context): FileLoweringPass
isSuspend = superFunction.isSuspend,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).apply {
it.bind(this)
val function = this
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InitializersLowering.kt
+2 -1
View File
@@ -121,7 +121,8 @@ internal class InitializersLowering(val context: CommonBackendContext) : ClassLo
isTailrec = false,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).apply {
it.bind(this)
parent = irClass
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt
+4 -2
View File
@@ -258,7 +258,8 @@ private class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfor
isSuspend = false,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).also { result ->
resultDescriptor.bind(result)
result.parent = irClass
@@ -402,7 +403,8 @@ private class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfor
isSuspend = false,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).apply {
it.bind(this)
}
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt
+4 -2
View File
@@ -490,7 +490,8 @@ internal class NativeSuspendFunctionsLowering(ctx: Context): AbstractSuspendFunc
isSuspend = false,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).apply {
it.bind(this)
}
@@ -511,7 +512,8 @@ internal class NativeSuspendFunctionsLowering(ctx: Context): AbstractSuspendFunc
isSuspend = false,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).apply {
it.bind(this)
}
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt
+4 -2
View File
@@ -350,7 +350,8 @@ internal class TestProcessor (val context: Context) {
isSuspend = false,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).apply {
descriptor.bind(this)
parent = owner
@@ -389,7 +390,8 @@ internal class TestProcessor (val context: Context) {
isSuspend = false,
isExpect = false,
isFakeOverride = false,
isOperator = false
isOperator = false,
isInfix = false
).apply {
descriptor.bind(this)
parent = owner