From b3cce3a8ace70bf3c32d2bb4cdf030fc4863a19a Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Wed, 17 Jun 2020 17:38:49 +0300 Subject: [PATCH] Remove fake override flag for IrFields (cherry picked from commit 63e421b12c5eb29fc8165bb2a33a020d1394915d) --- .../kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt | 1 - .../src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt | 1 - .../jetbrains/kotlin/backend/konan/lower/DelegationLowering.kt | 1 - .../backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt | 2 -- 4 files changed, 5 deletions(-) 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 df82076f8f3..1b806f09a42 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 @@ -78,7 +78,6 @@ internal class EnumSpecialDeclarationsFactory(val context: Context) { isFinal = true, isExternal = false, isStatic = false, - isFakeOverride = false ).apply { it.bind(this) parent = implObject 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 6f5398d57c8..7a8b8ae62f7 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 @@ -395,7 +395,6 @@ private class InlineClassTransformer(private val context: Context) : IrBuildingT isFinal = true, isExternal = false, isStatic = false, - isFakeOverride = false ) irField.parent = declaration 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 4f37655a5f0..56f909c1da5 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 @@ -97,7 +97,6 @@ internal class PropertyDelegationLowering(val context: Context) : FileLoweringPa isFinal = true, isExternal = false, isStatic = true, - isFakeOverride = false ).apply { it.bind(this) parent = irFile 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 4311474ac9e..66ad3997e8d 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 @@ -79,7 +79,6 @@ internal fun IrFile.addTopLevelInitializer(expression: IrExpression, context: Ko isFinal = true, isExternal = false, isStatic = true, - isFakeOverride = false ).apply { descriptor.bind(this) @@ -364,7 +363,6 @@ fun createField( !isMutable, false, false, - false ).apply { it.bind(this) owner.declarations += this