From 59cd1cd14a2db3faa824dfbef885c5ac5ab2f90d Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 19 Oct 2015 22:46:16 +0300 Subject: [PATCH] Restore referential equality for AnnotatedClassDescriptor and AnnotatedConstructorDescriptor. --- .../kotlin/annotation/AnnotationProcessorWrapper.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-annotation-processing/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationProcessorWrapper.kt b/libraries/tools/kotlin-annotation-processing/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationProcessorWrapper.kt index 2c90fc6da21..577f848112b 100644 --- a/libraries/tools/kotlin-annotation-processing/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationProcessorWrapper.kt +++ b/libraries/tools/kotlin-annotation-processing/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationProcessorWrapper.kt @@ -34,13 +34,18 @@ public class AnnotationProcessorStub : AbstractProcessor() { abstract class AnnotatedElementDescriptor(public val classFqName: String) -class AnnotatedClassDescriptor(classFqName: String) : AnnotatedElementDescriptor(classFqName) +class AnnotatedClassDescriptor(classFqName: String) : AnnotatedElementDescriptor(classFqName) { + // use referential equality +} + class AnnotatedMethodDescriptor(classFqName: String, public val methodName: String) : AnnotatedElementDescriptor(classFqName) { override fun equals(other: Any?) = other is AnnotatedMethodDescriptor && methodName == other.methodName override fun hashCode() = methodName.hashCode() } -class AnnotatedConstructorDescriptor(classFqName: String) : AnnotatedElementDescriptor(classFqName) +class AnnotatedConstructorDescriptor(classFqName: String) : AnnotatedElementDescriptor(classFqName) { + // use referential equality +} class AnnotatedFieldDescriptor(classFqName: String, public val fieldName: String) : AnnotatedElementDescriptor(classFqName) { override fun equals(other: Any?) = other is AnnotatedFieldDescriptor && fieldName == other.fieldName