From 0c8f0a433de64ea14c8e7635be5a90a3d6b262c2 Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <alexander.gorshenev@jetbrains.com>
Date: Fri, 15 Mar 2019 03:21:17 +0300
Subject: [PATCH] Copying kotlin-native fix

    * commit 575cbf48c3d839a963c3cdbe28d8fe41c85fe866
    | Author: SvyatoslavScherbina <Svyatoslav.Scherbina@jetbrains.com>
    | Date:   Thu Mar 14 14:25:10 2019 +0300
    |
    |     Optimize DescriptorReferenceDeserializer again (#2755)

to common ir deserializer.
---
 .../DeserializeDescriptorReference.kt          | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/DeserializeDescriptorReference.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/DeserializeDescriptorReference.kt
index ca5a4dbd97a..77ad90b13a7 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/DeserializeDescriptorReference.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/DeserializeDescriptorReference.kt
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
+import org.jetbrains.kotlin.resolve.scopes.MemberScope
 
 abstract class DescriptorReferenceDeserializer(
     val currentModule: ModuleDescriptor,
@@ -30,13 +31,22 @@ abstract class DescriptorReferenceDeserializer(
             if (it == "<root>") FqName.ROOT else FqName(it)
         }// TODO: would 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)
+    }
+
+    protected 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))
+ 
     }
 
     protected class ClassMembers(val defaultConstructor: ClassConstructorDescriptor?,
@@ -87,7 +97,7 @@ abstract class DescriptorReferenceDeserializer(
             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())
         }
 
         // TODO: This is still native specific. Eliminate.