From abf206a134f5646865dee87e223818142c829cbe Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Tue, 28 Feb 2017 17:23:18 +0300
Subject: [PATCH] KtLightMethod(Field): do not use clsDelegate in hashCode &&
 equality checks

---
 .../asJava/elements/KtLightFieldImpl.kt       | 15 +++--------
 .../kotlin/asJava/elements/KtLightMethod.kt   | 25 +++++++++++--------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightFieldImpl.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightFieldImpl.kt
index a50610d918c..1afc11ffc95 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightFieldImpl.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightFieldImpl.kt
@@ -102,18 +102,11 @@ sealed class KtLightFieldImpl<T: PsiField>(
     override fun toString(): String = "${this::class.java.simpleName}:$name"
 
     override fun equals(other: Any?): Boolean =
-            other is KtLightField &&
-            name == other.name &&
-            lightMemberOrigin == other.lightMemberOrigin &&
-            containingClass == other.containingClass &&
-            clsDelegate == other.clsDelegate
+            other is KtLightFieldImpl<*> &&
+            this.name == other.name &&
+            this.containingClass == other.containingClass
 
-    override fun hashCode(): Int {
-        var result = lightMemberOrigin?.hashCode() ?: 0
-        result = 31 * result + clsDelegate.hashCode()
-        result = 31 * result + containingClass.hashCode()
-        return result
-    }
+    override fun hashCode() = 31 * containingClass.hashCode() + (name?.hashCode() ?: 0)
 
     override val kotlinOrigin: KtDeclaration? get() = lightMemberOrigin?.originalElement
 
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethod.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethod.kt
index 658db5de0d8..071e4e0cc43 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethod.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethod.kt
@@ -27,9 +27,7 @@ import com.intellij.psi.scope.PsiScopeProcessor
 import com.intellij.psi.util.*
 import com.intellij.util.IncorrectOperationException
 import org.jetbrains.kotlin.asJava.LightClassUtil
-import org.jetbrains.kotlin.asJava.builder.ClsWrapperStubPsiFactory
-import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin
-import org.jetbrains.kotlin.asJava.builder.LightMemberOriginForDeclaration
+import org.jetbrains.kotlin.asJava.builder.*
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.asJava.propertyNameByAccessor
 import org.jetbrains.kotlin.asJava.unwrapped
@@ -188,14 +186,21 @@ class KtLightMethodImpl private constructor(
         return super.isEquivalentTo(another)
     }
 
-    override fun equals(other: Any?): Boolean =
-            other is KtLightMethod &&
-            name == other.name &&
-            lightMethodOrigin == other.lightMethodOrigin &&
-            containingClass == other.containingClass &&
-            clsDelegate == other.clsDelegate
+    private val _memberIndex: MemberIndex?
+        get() = (dummyDelegate ?: clsDelegate).memberIndex
 
-    override fun hashCode(): Int = ((getName().hashCode() * 31 + (lightMethodOrigin?.hashCode() ?: 0)) * 31 + containingClass.hashCode()) * 31 + clsDelegate.hashCode()
+    /* comparing origin and member index should be enough to determine equality:
+            for compiled elements origin contains delegate
+            for source elements index is unique to each member
+            */
+    override fun equals(other: Any?): Boolean =
+            other is KtLightMethodImpl &&
+            this.name == other.name &&
+            this.containingClass == other.containingClass &&
+            this.lightMethodOrigin == other.lightMethodOrigin &&
+            this._memberIndex == other._memberIndex
+
+    override fun hashCode(): Int = ((getName().hashCode() * 31 + (lightMethodOrigin?.hashCode() ?: 0)) * 31 + containingClass.hashCode()) * 31 + (_memberIndex?.hashCode() ?: 0)
 
     override fun toString(): String = "${this::class.java.simpleName}:$name"