Drop ClassKind.CLASS_OBJECT

Default and non-default objects now have ClassKind.OBJECT

core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassKind.java

@@ -22,10 +22,9 @@ public enum ClassKind {
     ENUM_CLASS,
     ENUM_ENTRY,
     ANNOTATION_CLASS,
-    OBJECT,
-    CLASS_OBJECT;
+    OBJECT;
 
     public boolean isSingleton() {
-        return this == OBJECT || this == CLASS_OBJECT || this == ENUM_ENTRY;
+        return this == OBJECT || this == ENUM_ENTRY;
     }
 }

core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java

@@ -1001,6 +1001,9 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
 
     @NotNull
     public static String getClassKindPrefix(@NotNull ClassDescriptor klass) {
+        if (klass.isDefaultObject()) {
+            return "class object";
+        }
         switch (klass.getKind()) {
             case CLASS:
                 return "class";
@@ -1012,8 +1015,6 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
                 return "object";
             case ANNOTATION_CLASS:
                 return "annotation class";
-            case CLASS_OBJECT:
-                return "class object";
             case ENUM_ENTRY:
                 return "enum entry";
             default:

core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java

@@ -241,7 +241,7 @@ public class DescriptorUtils {
     }
 
     public static boolean isDefaultObject(@Nullable DeclarationDescriptor descriptor) {
-        return isKindOf(descriptor, ClassKind.CLASS_OBJECT);
+        return isKindOf(descriptor, ClassKind.OBJECT) && ((ClassDescriptor) descriptor).isDefaultObject();
     }
 
     public static boolean isAnonymousObject(@NotNull DeclarationDescriptor descriptor) {
@@ -249,11 +249,11 @@ public class DescriptorUtils {
     }
 
     public static boolean isNonDefaultObject(@NotNull DeclarationDescriptor descriptor) {
-        return isKindOf(descriptor, ClassKind.OBJECT);
+        return isKindOf(descriptor, ClassKind.OBJECT) && !((ClassDescriptor) descriptor).isDefaultObject();
     }
 
     public static boolean isObject(@NotNull DeclarationDescriptor descriptor) {
-        return isDefaultObject(descriptor) || isNonDefaultObject(descriptor);
+        return isKindOf(descriptor, ClassKind.OBJECT);
     }
 
     public static boolean isEnumEntry(@NotNull DeclarationDescriptor descriptor) {
@@ -284,7 +284,7 @@ public class DescriptorUtils {
         return isKindOf(descriptor, ClassKind.CLASS);
     }
 
-    public static boolean isKindOf(@Nullable DeclarationDescriptor descriptor, @NotNull ClassKind classKind) {
+    private static boolean isKindOf(@Nullable DeclarationDescriptor descriptor, @NotNull ClassKind classKind) {
         return descriptor instanceof ClassDescriptor && ((ClassDescriptor) descriptor).getKind() == classKind;
     }
 

core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt

@@ -60,7 +60,7 @@ public val ClassDescriptor.classId: ClassId
 public val ClassDescriptor.classObjectDescriptor: ClassDescriptor?
     get() {
         return when (this.getKind()) {
-            CLASS_OBJECT, OBJECT -> this
+            OBJECT -> this
             ENUM_ENTRY -> {
                 val container = this.getContainingDeclaration()
                 assert(container is ClassDescriptor && container.getKind() == ENUM_CLASS)

core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java

@@ -143,6 +143,10 @@ public class MemberComparator implements Comparator<DeclarationDescriptor> {
             if (class1.getKind().ordinal() != class2.getKind().ordinal()) {
                 return class1.getKind().ordinal() - class2.getKind().ordinal();
             }
+
+            if (class1.isDefaultObject() != class2.isDefaultObject()) {
+                return class1.isDefaultObject() ? 1 : -1;
+            }
         }
         else {
             throw new AssertionError(String.format(

core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java

@@ -81,8 +81,8 @@ public class DescriptorSerializer {
     public ProtoBuf.Class.Builder classProto(@NotNull ClassDescriptor classDescriptor) {
         ProtoBuf.Class.Builder builder = ProtoBuf.Class.newBuilder();
 
-        int flags = Flags.getClassFlags(hasAnnotations(classDescriptor), classDescriptor.getVisibility(),
-                                        classDescriptor.getModality(), classDescriptor.getKind(), classDescriptor.isInner());
+        int flags = Flags.getClassFlags(hasAnnotations(classDescriptor), classDescriptor.getVisibility(), classDescriptor.getModality(),
+                                        classDescriptor.getKind(), classDescriptor.isInner(), classDescriptor.isDefaultObject());
         builder.setFlags(flags);
 
         builder.setFqName(getClassId(classDescriptor));

core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java

@@ -73,17 +73,20 @@ public class Flags {
             Visibility visibility,
             Modality modality,
             ClassKind kind,
-            boolean inner
+            boolean inner,
+            boolean isDefaultObject
     ) {
         return HAS_ANNOTATIONS.toFlags(hasAnnotations)
                | MODALITY.toFlags(modality(modality))
                | VISIBILITY.toFlags(visibility(visibility))
-               | CLASS_KIND.toFlags(classKind(kind))
+               | CLASS_KIND.toFlags(classKind(kind, isDefaultObject))
                | INNER.toFlags(inner)
                ;
     }
 
-    private static ProtoBuf.Class.Kind classKind(ClassKind kind) {
+    private static ProtoBuf.Class.Kind classKind(ClassKind kind, boolean isDefaultObject) {
+        if (isDefaultObject) return ProtoBuf.Class.Kind.CLASS_OBJECT;
+
         switch (kind) {
             case CLASS:
                 return ProtoBuf.Class.Kind.CLASS;
@@ -97,8 +100,6 @@ public class Flags {
                 return ProtoBuf.Class.Kind.ANNOTATION_CLASS;
             case OBJECT:
                 return ProtoBuf.Class.Kind.OBJECT;
-            case CLASS_OBJECT:
-                return ProtoBuf.Class.Kind.CLASS_OBJECT;
         }
         throw new IllegalArgumentException("Unknown class kind: " + kind);
     }

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt

@@ -45,7 +45,9 @@ public class DeserializedClassDescriptor(
 ) {
     private val modality = deserialization.modality(Flags.MODALITY.get(classProto.getFlags()))
     private val visibility = deserialization.visibility(Flags.VISIBILITY.get(classProto.getFlags()))
-    private val kind = deserialization.classKind(Flags.CLASS_KIND.get(classProto.getFlags()))
+    private val kindFromProto = Flags.CLASS_KIND.get(classProto.getFlags())
+    private val kind = deserialization.classKind(kindFromProto)
+    private val isDefault = kindFromProto == ProtoBuf.Class.Kind.CLASS_OBJECT
     private val isInner = Flags.INNER.get(classProto.getFlags())
 
     val c = outerContext.childContext(this, classProto.getTypeParameterList(), nameResolver)
@@ -88,7 +90,7 @@ public class DeserializedClassDescriptor(
 
     override fun getStaticScope() = staticScope
 
-    override fun isDefaultObject(): Boolean = getKind() == ClassKind.CLASS_OBJECT
+    override fun isDefaultObject(): Boolean = isDefault
 
     private fun computePrimaryConstructor(): ConstructorDescriptor? {
         if (!classProto.hasPrimaryConstructor()) return null

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt

@@ -52,8 +52,7 @@ public fun classKind(kind: ProtoBuf.Class.Kind): ClassKind = when (kind) {
     ProtoBuf.Class.Kind.ENUM_CLASS -> ClassKind.ENUM_CLASS
     ProtoBuf.Class.Kind.ENUM_ENTRY -> ClassKind.ENUM_ENTRY
     ProtoBuf.Class.Kind.ANNOTATION_CLASS -> ClassKind.ANNOTATION_CLASS
-    ProtoBuf.Class.Kind.OBJECT -> ClassKind.OBJECT
-    ProtoBuf.Class.Kind.CLASS_OBJECT -> ClassKind.CLASS_OBJECT
+    ProtoBuf.Class.Kind.OBJECT, ProtoBuf.Class.Kind.CLASS_OBJECT -> ClassKind.OBJECT
 }
 
 fun variance(variance: TypeParameter.Variance) = when (variance) {