From 0a861fd4ed80723e55dce892a787b6e87efe4dc8 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 13 Oct 2017 20:13:02 +0200
Subject: [PATCH] Minor, refine return type of
 AbstractClassTypeConstructor.getDeclarationDescriptor

---
 .../psi/synthetics/SyntheticClassOrObjectDescriptor.kt      | 2 +-
 .../resolve/lazy/descriptors/LazyClassDescriptor.java       | 2 +-
 .../load/java/lazy/descriptors/LazyJavaClassDescriptor.kt   | 4 ++--
 .../kotlin/types/AbstractClassTypeConstructor.java          | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/synthetics/SyntheticClassOrObjectDescriptor.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/synthetics/SyntheticClassOrObjectDescriptor.kt
index b1383c458dd..77456d9fca8 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/synthetics/SyntheticClassOrObjectDescriptor.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/synthetics/SyntheticClassOrObjectDescriptor.kt
@@ -116,7 +116,7 @@ class SyntheticClassOrObjectDescriptor(
         override fun getParameters(): List<TypeParameterDescriptor> = emptyList()
         override fun isFinal(): Boolean = true
         override fun isDenotable(): Boolean = true
-        override fun getDeclarationDescriptor(): ClassifierDescriptor = thisDescriptor
+        override fun getDeclarationDescriptor(): ClassDescriptor = thisDescriptor
         override fun computeSupertypes(): Collection<KotlinType> = syntheticSupertypes
         override val supertypeLoopChecker: SupertypeLoopChecker = SupertypeLoopChecker.EMPTY
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
index e58a141291c..cad3b30e81b 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
@@ -662,7 +662,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
 
         @Override
         @NotNull
-        public ClassifierDescriptor getDeclarationDescriptor() {
+        public ClassDescriptor getDeclarationDescriptor() {
             return LazyClassDescriptor.this;
         }
 
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt
index a921b626ffe..06893292249 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt
@@ -257,9 +257,9 @@ class LazyJavaClassDescriptor(
 
         override fun isFinal(): Boolean = isFinalClass
 
-        override fun isDenotable() = true
+        override fun isDenotable(): Boolean = true
 
-        override fun getDeclarationDescriptor() = this@LazyJavaClassDescriptor
+        override fun getDeclarationDescriptor(): ClassDescriptor = this@LazyJavaClassDescriptor
 
         override fun toString(): String = name.asString()
     }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/AbstractClassTypeConstructor.java b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractClassTypeConstructor.java
index f6a75b7ecbb..06d6842b59a 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/AbstractClassTypeConstructor.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractClassTypeConstructor.java
@@ -39,7 +39,7 @@ public abstract class AbstractClassTypeConstructor extends AbstractTypeConstruct
         if (currentHashCode != 0) return currentHashCode;
 
         ClassifierDescriptor descriptor = getDeclarationDescriptor();
-        if (descriptor instanceof ClassDescriptor && hasMeaningfulFqName(descriptor)) {
+        if (hasMeaningfulFqName(descriptor)) {
             currentHashCode = DescriptorUtils.getFqName(descriptor).hashCode();
         }
         else {
@@ -51,7 +51,7 @@ public abstract class AbstractClassTypeConstructor extends AbstractTypeConstruct
 
     @NotNull
     @Override
-    public abstract ClassifierDescriptor getDeclarationDescriptor();
+    public abstract ClassDescriptor getDeclarationDescriptor();
 
     @NotNull
     @Override
@@ -81,7 +81,7 @@ public abstract class AbstractClassTypeConstructor extends AbstractTypeConstruct
             return false;
         }
 
-        if (myDescriptor instanceof ClassDescriptor && otherDescriptor instanceof ClassDescriptor) {
+        if (otherDescriptor instanceof ClassDescriptor) {
             return areFqNamesEqual(((ClassDescriptor) myDescriptor), ((ClassDescriptor) otherDescriptor));
         }