From b5296104e9c2fd7946d583d6f7f2853c75971224 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 15 Oct 2015 20:07:05 +0300 Subject: [PATCH] Ignore fake overrides when generating stub methods for MutableCollections Because it's redundant as we go through all mutable collection hierarchy anyway It wasn't a problem because for fake override just `generatedBridges` is being called and there were no special bridges for such methods. --- .../jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt index 2baadde96d2..56cc9a1226f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt @@ -199,7 +199,7 @@ class CollectionStubMethodGenerator( OverrideResolver.generateOverridesInAClass(klass, listOf(), object : OverridingUtil.DescriptorSink { override fun addFakeOverride(fakeOverride: CallableMemberDescriptor) { if (fakeOverride !is FunctionDescriptor) return - if (fakeOverride.findOverriddenFromDirectSuperClass(mutableCollectionClass) != null) { + if (fakeOverride.findOverriddenFromDirectSuperClass(mutableCollectionClass)?.kind == DECLARATION) { result.add(fakeOverride) } }