From 261cac7514a1e47e25c744926eb3ebd361e94d7b Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Wed, 23 Feb 2022 11:13:15 +0700 Subject: [PATCH] [light classes] avoid resolve in equals ^KTIJ-21209 --- .../org/jetbrains/kotlin/asJava/classes/ultraLightMethods.kt | 3 +-- .../org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethods.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethods.kt index 724290442b6..a65b0bb5569 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethods.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethods.kt @@ -137,8 +137,7 @@ internal abstract class KtUltraLightMethod( override fun equals(other: Any?): Boolean = other === this || other is KtUltraLightMethod && other.methodIndex == methodIndex && - super.equals(other) && - other.delegate == delegate + super.equals(other) override fun hashCode(): Int = super.hashCode().times(31).plus(methodIndex.hashCode()) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt index 6b021987730..8cfac0ccb93 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt @@ -155,8 +155,7 @@ open class KtLightMethodImpl protected constructor( other.javaClass == javaClass && other.memberIndex == memberIndex && other.containingClass == containingClass && - other.lightMemberOrigin == lightMemberOrigin && - other.dummyDelegate == dummyDelegate + other.lightMemberOrigin == lightMemberOrigin override fun hashCode(): Int = name.hashCode() .times(31).plus(containingClass.hashCode())