From fd3683eb00c11b8cb4389b8fc9f33183754ce73c Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Tue, 20 Mar 2018 15:26:14 +0300 Subject: [PATCH] Don't unwrap fake override in `serializeDescriptor()`. It is not needed for newly declared descriptors, and it is harmful to (potentially substituted) uses. --- .../backend/konan/serialization/IrDescriptorSerializer.kt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrDescriptorSerializer.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrDescriptorSerializer.kt index dbb36267708..4f9bf075d1b 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrDescriptorSerializer.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrDescriptorSerializer.kt @@ -125,14 +125,6 @@ internal class IrDescriptorSerializer( } fun serializeDescriptor(descriptor: DeclarationDescriptor): KonanIr.KotlinDescriptor { - - if (descriptor is CallableMemberDescriptor && - descriptor.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) { - // TODO: It seems rather braindead. - // Do we need to do anything more than that? - return serializeDescriptor(DescriptorUtils.unwrapFakeOverride(descriptor)) - } - val classOrPackage = descriptor.classOrPackage val parentFqNameIndex = if (classOrPackage is ClassOrPackageFragmentDescriptor) { stringTable.getClassOrPackageFqNameIndex(classOrPackage)