diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java index cd21f7e8adb..46b4411edeb 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java @@ -314,16 +314,16 @@ public class DescriptorUtils { return superClassDescriptors; } - @Nullable + @NotNull public static JetType getSuperClassType(@NotNull ClassDescriptor classDescriptor) { Collection superclassTypes = classDescriptor.getTypeConstructor().getSupertypes(); for (JetType type : superclassTypes) { ClassDescriptor superClassDescriptor = getClassDescriptorForType(type); - if (!isAny(superClassDescriptor) && superClassDescriptor.getKind() != ClassKind.TRAIT) { + if (superClassDescriptor.getKind() != ClassKind.TRAIT) { return type; } } - return null; + return KotlinBuiltIns.getInstance().getAnyType(); } @NotNull