diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/utils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/utils.kt index 9562fadf03b..4a93896fd67 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/utils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/utils.kt @@ -7,15 +7,8 @@ package org.jetbrains.kotlin.backend.konan.descriptors import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.metadata.konan.KonanProtoBuf import org.jetbrains.kotlin.serialization.deserialization.descriptors.* -val DeserializedPropertyDescriptor.konanBackingField: PropertyDescriptor? - get() = - if (this.proto.getExtension(KonanProtoBuf.hasBackingField)) - this - else null - fun DeclarationDescriptor.deepPrint() { this.accept(DeepPrintVisitor(PrintVisitor()), 0) } diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt index 6d601960428..b65511abe49 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt @@ -37,11 +37,7 @@ import kotlin.properties.Delegates // This is what Context collects about IR. internal class KonanIr(context: Context, irModule: IrModuleFragment): Ir(context, irModule) { - - val propertiesWithBackingFields = mutableSetOf() - override var symbols: KonanSymbols by Delegates.notNull() - } internal class KonanSymbols(context: Context, private val symbolTable: SymbolTable, lazySymbolTable: ReferenceSymbolTable): Symbols(context, lazySymbolTable) { diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanSerializerExtension.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanSerializerExtension.kt index fd8686366b6..61c20db1a01 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanSerializerExtension.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanSerializerExtension.kt @@ -76,9 +76,6 @@ internal class KonanSerializerExtension(val context: Context, override val metad childSerializer: DescriptorSerializer) { proto.setExtension(KonanProtoBuf.propertyFile, sourceFileMap.assign(descriptor.source.containingFile)) uniqId(descriptor) ?.let { proto.setExtension(KonanProtoBuf.propertyUniqId, it) } - proto.setExtension(KonanProtoBuf.hasBackingField, - context.ir.propertiesWithBackingFields.contains(descriptor)) - super.serializeProperty(descriptor, proto, versionRequirementTable, childSerializer) } diff --git a/extracted/konan.metadata/src/KonanProtoBuf.proto b/extracted/konan.metadata/src/KonanProtoBuf.proto index 90357e7f68c..6f1fdba17df 100644 --- a/extracted/konan.metadata/src/KonanProtoBuf.proto +++ b/extracted/konan.metadata/src/KonanProtoBuf.proto @@ -44,7 +44,6 @@ extend Property { repeated Annotation property_annotation = 170; repeated Annotation property_getter_annotation = 177; repeated Annotation property_setter_annotation = 178; - optional bool has_backing_field = 171; optional Annotation.Argument.Value compile_time_value = 173; optional int32 property_file = 176; optional DescriptorUniqId property_uniq_id = 179;