diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Boxing.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Boxing.kt index 305be355279..8397b26ece7 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Boxing.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Boxing.kt @@ -72,7 +72,8 @@ internal val Context.getBoxFunction: (IrClass) -> IrSimpleFunction by Context.la isExternal = false, isTailrec = false, isSuspend = false, - isExpect = false + isExpect = false, + isFakeOverride = false ).also { function -> function.valueParameters.add(WrappedValueParameterDescriptor().let { IrValueParameterImpl( @@ -124,7 +125,8 @@ internal val Context.getUnboxFunction: (IrClass) -> IrSimpleFunction by Context. isExternal = false, isTailrec = false, isSuspend = false, - isExpect = false + isExpect = false, + isFakeOverride = false ).also { function -> function.valueParameters.add(WrappedValueParameterDescriptor().let { IrValueParameterImpl( diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt index 8e4e1ae004b..c207b9aa5a2 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt @@ -141,7 +141,8 @@ internal class SpecialDeclarationsFactory(val context: Context) : KotlinMangler isTailrec = false, isSuspend = function.isSuspend, returnType = returnType, - isExpect = false + isExpect = false, + isFakeOverride = false ).apply { descriptor.bind(this) parent = function.parent diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EntryPoint.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EntryPoint.kt index 005dc682c30..ca832d0961e 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EntryPoint.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EntryPoint.kt @@ -40,7 +40,8 @@ internal fun makeEntryPoint(context: Context): IrFunction { isExternal = false, isTailrec = false, isSuspend = false, - isExpect = false + isExpect = false, + isFakeOverride = false ).also { function -> function.valueParameters.add(WrappedValueParameterDescriptor().let { IrValueParameterImpl( diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt index 920b4c34d2e..7d39330fd6b 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt @@ -76,7 +76,8 @@ internal class EnumSpecialDeclarationsFactory(val context: Context) { Visibilities.PRIVATE, isFinal = true, isExternal = false, - isStatic = false + isStatic = false, + isFakeOverride = false ).apply { it.bind(this) parent = implObject @@ -96,7 +97,8 @@ internal class EnumSpecialDeclarationsFactory(val context: Context) { isExternal = false, isTailrec = false, isSuspend = false, - isExpect = false + isExpect = false, + isFakeOverride = false ).apply { it.bind(this) parent = implObject diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt index 252cacc0ec1..b43d897c802 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt @@ -571,7 +571,8 @@ private fun KotlinStubs.createFakeKotlinExternalFunction( isExternal = true, isTailrec = false, isSuspend = false, - isExpect = false + isExpect = false, + isFakeOverride = false ) bridgeDescriptor.bind(bridge) @@ -1261,7 +1262,8 @@ private class ObjCBlockPointerValuePassing( overriddenInvokeMethod.name, Visibilities.PUBLIC, Modality.FINAL, returnType = functionType.arguments.last().typeOrNull!!, - isInline = false, isExternal = false, isTailrec = false, isSuspend = false, isExpect = false + isInline = false, isExternal = false, isTailrec = false, isSuspend = false, isExpect = false, + isFakeOverride = false ) invokeMethodDescriptor.bind(invokeMethod) invokeMethod.overriddenSymbols += overriddenInvokeMethod.symbol diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGenUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGenUtils.kt index 90a1bc456ca..8d2671459b1 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGenUtils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGenUtils.kt @@ -116,7 +116,8 @@ private fun createKotlinBridge( isExternal = isExternal, isTailrec = false, isSuspend = false, - isExpect = false + isExpect = false, + isFakeOverride = false ) bridgeDescriptor.bind(bridge) if (isExternal) { diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt index ed715a14036..c21712fe06d 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt @@ -394,7 +394,8 @@ private class InlineClassTransformer(private val context: Context) : IrBuildingT Visibilities.PRIVATE, isFinal = true, isExternal = false, - isStatic = false + isStatic = false, + isFakeOverride = false ) irField.parent = declaration @@ -502,7 +503,8 @@ private val Context.getLoweredInlineClassConstructor: (IrConstructor) -> IrSimpl isTailrec = false, isSuspend = false, returnType = irConstructor.returnType, - isExpect = false + isExpect = false, + isFakeOverride = false ).apply { descriptor.bind(this) parent = irConstructor.parent diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BridgesBuilding.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BridgesBuilding.kt index d4d867eef8b..96d817d09a8 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BridgesBuilding.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BridgesBuilding.kt @@ -83,7 +83,8 @@ internal class WorkersBridgesBuilding(val context: Context) : DeclarationContain isTailrec = false, isSuspend = false, returnType = context.irBuiltIns.anyNType, - isExpect = false + isExpect = false, + isFakeOverride = false ).apply { it.bind(this) } diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt index 632e56d9492..b3e8df344cf 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt @@ -309,7 +309,8 @@ internal class CallableReferenceLowering(val context: Context): FileLoweringPass isExternal = false, isTailrec = false, isSuspend = superFunction.isSuspend, - isExpect = false + isExpect = false, + isFakeOverride = false ).apply { it.bind(this) val function = this diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DelegationLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DelegationLowering.kt index 80a154599d8..a394ed66431 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DelegationLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DelegationLowering.kt @@ -101,7 +101,8 @@ internal class PropertyDelegationLowering(val context: Context) : FileLoweringPa Visibilities.PRIVATE, isFinal = true, isExternal = false, - isStatic = true + isStatic = true, + isFakeOverride = false ).apply { it.bind(this) parent = irFile diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FinallyBlocksLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FinallyBlocksLowering.kt index b794bc91178..ddd3831a99b 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FinallyBlocksLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FinallyBlocksLowering.kt @@ -187,6 +187,7 @@ internal class FinallyBlocksLowering(val context: Context): FileLoweringPass, Ir false, false, false, + false, false) ) return descriptor diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InitializersLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InitializersLowering.kt index 342fb5ada9e..76ad9db7421 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InitializersLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InitializersLowering.kt @@ -108,7 +108,8 @@ internal class InitializersLowering(val context: CommonBackendContext) : ClassLo isSuspend = false, isExternal = false, isTailrec = false, - isExpect = false + isExpect = false, + isFakeOverride = false ).apply { it.bind(this) parent = irClass diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt index 38405422043..9bd6688689f 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt @@ -234,7 +234,8 @@ internal class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfo isExternal = false, isTailrec = false, isSuspend = false, - isExpect = false + isExpect = false, + isFakeOverride = false ).also { result -> resultDescriptor.bind(result) result.parent = irClass @@ -376,7 +377,8 @@ internal class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfo isExternal = false, isTailrec = false, isSuspend = false, - isExpect = false + isExpect = false, + isFakeOverride = false ).apply { it.bind(this) } diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt index 8d259ca0e33..14de72df180 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt @@ -488,7 +488,8 @@ internal class NativeSuspendFunctionsLowering(ctx: Context): AbstractSuspendFunc isExternal = false, isTailrec = false, isSuspend = false, - isExpect = false + isExpect = false, + isFakeOverride = false ).apply { it.bind(this) } @@ -507,7 +508,8 @@ internal class NativeSuspendFunctionsLowering(ctx: Context): AbstractSuspendFunc isExternal = false, isTailrec = false, isSuspend = false, - isExpect = false + isExpect = false, + isFakeOverride = false ).apply { it.bind(this) } diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt index f3af1641a36..0407008367f 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt @@ -350,7 +350,8 @@ internal class TestProcessor (val context: Context) { isExternal = false, isTailrec = false, isSuspend = false, - isExpect = false + isExpect = false, + isFakeOverride = false ).apply { descriptor.bind(this) parent = owner @@ -387,7 +388,8 @@ internal class TestProcessor (val context: Context) { isExternal = false, isTailrec = false, isSuspend = false, - isExpect = false + isExpect = false, + isFakeOverride = false ).apply { descriptor.bind(this) parent = owner diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt index 5871fd9ae65..00639bc7266 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt @@ -73,7 +73,8 @@ internal fun IrFile.addTopLevelInitializer(expression: IrExpression, context: Ko Visibilities.PRIVATE, isFinal = true, isExternal = false, - isStatic = true + isStatic = true, + isFakeOverride = false ).apply { descriptor.bind(this) @@ -367,6 +368,7 @@ fun createField( Visibilities.PRIVATE, !isMutable, false, + false, false ).apply { it.bind(this)