azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Error types should not be compared by FqName

Browse Source
This commit is contained in:
Andrey Breslav
2014-05-19 13:30:41 +04:00
parent a66f44e4f5
commit bee4dbc672
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/types/AbstractClassTypeConstructor.java
+10 -2
View File
@@ -36,9 +36,16 @@ public abstract class AbstractClassTypeConstructor implements TypeConstructor {
public static boolean equals(@NotNull TypeConstructor me, Object other) { public static boolean equals(@NotNull TypeConstructor me, Object other) {
if (!(other instanceof TypeConstructor)) return false; if (!(other instanceof TypeConstructor)) return false;
ClassifierDescriptor myDescriptor = me.getDeclarationDescriptor(); ClassifierDescriptor myDescriptor = me.getDeclarationDescriptor();
ClassifierDescriptor otherDescriptor = ((TypeConstructor) other).getDeclarationDescriptor(); ClassifierDescriptor otherDescriptor = ((TypeConstructor) other).getDeclarationDescriptor();
// All error types have the same descriptor
if (myDescriptor != null && ErrorUtils.isError(myDescriptor)
|| otherDescriptor != null && ErrorUtils.isError(otherDescriptor)) {
return me == other;
}
if (myDescriptor == otherDescriptor) return true; if (myDescriptor == otherDescriptor) return true;
if (myDescriptor instanceof ClassDescriptor && otherDescriptor instanceof ClassDescriptor) { if (myDescriptor instanceof ClassDescriptor && otherDescriptor instanceof ClassDescriptor) {
@@ -51,8 +58,9 @@ public abstract class AbstractClassTypeConstructor implements TypeConstructor {
} }
public static int hashCode(@NotNull TypeConstructor me) { public static int hashCode(@NotNull TypeConstructor me) {
if (me.getDeclarationDescriptor() instanceof ClassDescriptor) { ClassifierDescriptor descriptor = me.getDeclarationDescriptor();
ClassDescriptor classDescriptor = (ClassDescriptor) me.getDeclarationDescriptor(); if (descriptor instanceof ClassDescriptor && !ErrorUtils.isError(descriptor)) {
ClassDescriptor classDescriptor = (ClassDescriptor) descriptor;
return DescriptorUtils.getFqName(classDescriptor).hashCode(); return DescriptorUtils.getFqName(classDescriptor).hashCode();
} }
return System.identityHashCode(me); return System.identityHashCode(me);