From 575cbf48c3d839a963c3cdbe28d8fe41c85fe866 Mon Sep 17 00:00:00 2001
From: SvyatoslavScherbina <Svyatoslav.Scherbina@jetbrains.com>
Date: Thu, 14 Mar 2019 14:25:10 +0300
Subject: [PATCH] Optimize DescriptorReferenceDeserializer again (#2755)

---
 .../DeserializeDescriptorReference.kt            | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/DeserializeDescriptorReference.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/DeserializeDescriptorReference.kt
index c473ecc6757..b517b04b6db 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/DeserializeDescriptorReference.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/DeserializeDescriptorReference.kt
@@ -6,6 +6,7 @@ import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
+import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
 
 // This is all information needed to find a descriptor in the
@@ -19,13 +20,20 @@ class DescriptorReferenceDeserializer(val currentModule: ModuleDescriptor, val r
             if (it == "<root>") FqName.ROOT else FqName(it)
         }// TODO: whould we store an empty string in the protobuf?
 
-        val contributedName = if (name.startsWith("<get-") || name.startsWith("<set-")) {
+        val memberScope = currentModule.getPackage(packageFqName).memberScope
+        return getContributedDescriptors(memberScope, name)
+    }
+
+    private fun getContributedDescriptors(memberScope: MemberScope, name: String): Collection<DeclarationDescriptor> {
+        val contributedNameString = if (name.startsWith("<get-") || name.startsWith("<set-")) {
             name.substring(5, name.length - 1) // FIXME: rework serialization format.
         } else {
             name
         }
-        return currentModule.getPackage(packageFqName).memberScope
-                .getContributedDescriptors(nameFilter = { it.asString() == contributedName })
+        val contributedName = Name.identifier(contributedNameString)
+        return memberScope.getContributedFunctions(contributedName, NoLookupLocation.FROM_BACKEND) +
+                memberScope.getContributedVariables(contributedName, NoLookupLocation.FROM_BACKEND) +
+                listOfNotNull(memberScope.getContributedClassifier(contributedName, NoLookupLocation.FROM_BACKEND))
     }
 
     private class ClassMembers(val defaultConstructor: ClassConstructorDescriptor?,
@@ -74,7 +82,7 @@ class DescriptorReferenceDeserializer(val currentModule: ModuleDescriptor, val r
             Pair(null, getContributedDescriptors(packageFqNameString, name))
         } else {
             val clazz = currentModule.findClassAcrossModuleDependencies(ClassId(packageFqName, classFqName, false))!!
-            Pair(clazz, clazz.unsubstitutedMemberScope.getContributedDescriptors() + clazz.getConstructors())
+            Pair(clazz, getContributedDescriptors(clazz.unsubstitutedMemberScope, name) + clazz.getConstructors())
         }
 
         if (packageFqNameString.startsWith("cnames.") || packageFqNameString.startsWith("objcnames.")) {