Introduce ClassDescriptor#getDefaultObjectDescriptor()

ClassDescriptor#getClassObjectDescriptor (with old semantics) is now a utility
Process usages and replace with calls to a new method where appropriate

compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java

@@ -1915,7 +1915,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
                 Type type = typeMapper.mapType((ClassDescriptor) enumClass);
                 return StackValue.field(type, type, descriptor.getName().asString(), true, StackValue.none());
             }
-            ClassDescriptor classObjectDescriptor = classDescriptor.getClassObjectDescriptor();
+            ClassDescriptor classObjectDescriptor = classDescriptor.getDefaultObjectDescriptor();
             if (classObjectDescriptor != null) {
                 return StackValue.singleton(classObjectDescriptor, typeMapper);
             }

compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java

@@ -960,7 +960,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
     private void generateFieldForSingleton() {
         if (isEnumEntry(descriptor) || isClassObject(descriptor)) return;
 
-        ClassDescriptor classObjectDescriptor = descriptor.getClassObjectDescriptor();
+        ClassDescriptor classObjectDescriptor = descriptor.getDefaultObjectDescriptor();
         ClassDescriptor fieldTypeDescriptor;
         JetClassOrObject original;
         if (isObject(descriptor)) {
@@ -1022,7 +1022,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
 
     private int putClassObjectInLocalVar(ExpressionCodegen codegen) {
         FrameMap frameMap = codegen.myFrameMap;
-        ClassDescriptor classObjectDescriptor = descriptor.getClassObjectDescriptor();
+        ClassDescriptor classObjectDescriptor = descriptor.getDefaultObjectDescriptor();
         int classObjectIndex = frameMap.getIndex(classObjectDescriptor);
         if (classObjectIndex == -1) {
             classObjectIndex = frameMap.enter(classObjectDescriptor, OBJECT_TYPE);

compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java

@@ -62,8 +62,8 @@ public class ClassContext extends FieldOwnerContext<ClassDescriptor> {
 
     @Nullable
     public CodegenContext getClassObjectContext() {
-        if (getContextDescriptor().getClassObjectDescriptor() != null) {
+        if (getContextDescriptor().getDefaultObjectDescriptor() != null) {
-            return findChildContext(getContextDescriptor().getClassObjectDescriptor());
+            return findChildContext(getContextDescriptor().getDefaultObjectDescriptor());
         }
         return null;
     }

compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java

@@ -38,7 +38,7 @@ public interface ClassDescriptorWithResolutionScopes extends ClassDescriptor {
 
     @Nullable
     @Override
-    ClassDescriptorWithResolutionScopes getClassObjectDescriptor();
+    ClassDescriptorWithResolutionScopes getDefaultObjectDescriptor();
 
     @NotNull
     @ReadOnly

compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java

@@ -92,7 +92,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class
 
     @Nullable
     @Override
-    public MutableClassDescriptor getClassObjectDescriptor() {
+    public MutableClassDescriptor getDefaultObjectDescriptor() {
         return classObjectDescriptor;
     }
 

compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.java

@@ -100,8 +100,8 @@ public class DeclarationResolver {
 
             Collection<DeclarationDescriptor> allDescriptors = classDescriptor.getScopeForMemberLookup().getOwnDeclaredDescriptors();
 
-            ClassDescriptorWithResolutionScopes classObj = classDescriptor.getClassObjectDescriptor();
+            ClassDescriptorWithResolutionScopes classObj = classDescriptor.getDefaultObjectDescriptor();
-            if (classObj != null && DescriptorUtils.isClassObject(classObj)) {
+            if (classObj != null) {
                 Collection<DeclarationDescriptor> classObjDescriptors = classObj.getScopeForMemberLookup().getOwnDeclaredDescriptors();
                 if (!classObjDescriptors.isEmpty()) {
                     allDescriptors = Lists.newArrayList(allDescriptors);

compiler/frontend/src/org/jetbrains/kotlin/resolve/Importer.kt

@@ -38,8 +38,8 @@ public class Importer {
             allUnderImportScopes.add(descriptor.getStaticScope())
             allUnderImportScopes.add(descriptor.getUnsubstitutedInnerClassesScope())
 
-            val classObjectDescriptor = descriptor.getClassObjectDescriptor()
+            val classObjectDescriptor = descriptor.getDefaultObjectDescriptor()
-            if (classObjectDescriptor != null && DescriptorUtils.isClassObject(classObjectDescriptor)) {
+            if (classObjectDescriptor != null) {
                 allUnderImportScopes.add(classObjectDescriptor.getUnsubstitutedInnerClassesScope())
             }
         }

compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.java

@@ -276,8 +276,8 @@ public class QualifiedExpressionResolver {
 
         results.add(lookupSimpleNameReference(selector, descriptor.getStaticScope(), lookupMode, true));
 
-        ClassDescriptor classObject = descriptor.getClassObjectDescriptor();
+        ClassDescriptor classObject = descriptor.getDefaultObjectDescriptor();
-        if (classObject != null && !descriptor.getKind().isSingleton()) {
+        if (classObject != null) {
             addResultsForClass(results, selector, lookupMode, classObject);
         }
     }

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java

@@ -57,7 +57,6 @@ import java.util.*;
 
 import static org.jetbrains.kotlin.diagnostics.Errors.*;
 import static org.jetbrains.kotlin.resolve.BindingContext.TYPE;
-import static org.jetbrains.kotlin.resolve.DescriptorUtils.isSyntheticClassObject;
 import static org.jetbrains.kotlin.resolve.ModifiersChecker.*;
 import static org.jetbrains.kotlin.resolve.source.SourcePackage.toSourceElement;
 
@@ -130,9 +129,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
         }
 
         boolean isLocal = classOrObject != null && JetPsiUtil.isLocal(classOrObject);
-        this.visibility = isSyntheticClassObject(this)
+        this.visibility = isLocal ? Visibilities.LOCAL : resolveVisibilityFromModifiers(modifierList, getDefaultClassVisibility(this));
-                          ? DescriptorUtils.getSyntheticClassObjectVisibility()
-                          : isLocal ? Visibilities.LOCAL : resolveVisibilityFromModifiers(modifierList, getDefaultClassVisibility(this));
         this.isInner = isInnerClass(modifierList) && !ModifiersChecker.isIllegalInner(this);
 
         StorageManager storageManager = c.getStorageManager();
@@ -269,8 +266,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
         thisScope.setImplicitReceiver(this.getThisAsReceiverParameter());
         thisScope.changeLockLevel(WritableScope.LockLevel.READING);
 
-        //TODO:
+        ClassDescriptor classObject = getDefaultObjectDescriptor();
-        ClassDescriptor classObject = getClassObjectDescriptor();
         JetScope classObjectAdapterScope = (classObject != null) ? new ClassObjectMixinScope(classObject) : JetScope.Empty.INSTANCE$;
 
         return new ChainedScope(
@@ -350,7 +346,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
     }
 
     @Override
-    public LazyClassDescriptor getClassObjectDescriptor() {
+    public LazyClassDescriptor getDefaultObjectDescriptor() {
         return classObjectDescriptor.invoke();
     }
 
@@ -381,26 +377,18 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
     @Nullable
     private LazyClassDescriptor computeClassObjectDescriptor(@Nullable JetObjectDeclaration classObject) {
         JetClassLikeInfo classObjectInfo = getClassObjectInfo(classObject);
-        if (classObjectInfo instanceof JetClassOrObjectInfo) {
+        if (!(classObjectInfo instanceof JetClassOrObjectInfo)) {
-            Name name = ((JetClassOrObjectInfo) classObjectInfo).getName();
+            return null;
-            assert name != null;
-            ClassifierDescriptor classObjectDescriptor = getScopeForMemberLookup().getClassifier(name);
-            if (classObjectDescriptor instanceof LazyClassDescriptor) {
-                return (LazyClassDescriptor) classObjectDescriptor;
-            }
-            else {
-                return null;
-            }
         }
-        if (getKind() == ClassKind.CLASS_OBJECT || getKind() == ClassKind.OBJECT) {
+        Name name = ((JetClassOrObjectInfo) classObjectInfo).getName();
-            return this;
+        assert name != null;
+        ClassifierDescriptor classObjectDescriptor = getScopeForMemberLookup().getClassifier(name);
+        if (classObjectDescriptor instanceof LazyClassDescriptor) {
+            return (LazyClassDescriptor) classObjectDescriptor;
         }
-        if (getKind() == ClassKind.ENUM_ENTRY) {
+        else {
-            DeclarationDescriptor containingDeclaration = getContainingDeclaration();
+            return null;
-            assert containingDeclaration instanceof ClassDescriptor && ((ClassDescriptor) containingDeclaration).getKind() == ClassKind.ENUM_CLASS;
-            return (LazyClassDescriptor) containingDeclaration;
         }
-        return null;
     }
 
     @Nullable
@@ -473,8 +461,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
 
     private void doForceResolveAllContents() {
         resolveMemberHeaders();
-        //TODO:
+        ClassDescriptor classObjectDescriptor = getDefaultObjectDescriptor();
-        ClassDescriptor classObjectDescriptor = getClassObjectDescriptor();
         if (classObjectDescriptor != null) {
             ForceResolveUtil.forceResolveAllContents(classObjectDescriptor);
         }
@@ -490,7 +477,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
         ForceResolveUtil.forceResolveAllContents(getAnnotations());
         ForceResolveUtil.forceResolveAllContents(getDanglingAnnotations());
 
-        getClassObjectDescriptor();
+        getDefaultObjectDescriptor();
 
         getDescriptorsForExtraClassObjects();
 

compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt

@@ -34,6 +34,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.getClassObjectReferenceTarget
 import org.jetbrains.kotlin.psi.JetExpression
 import org.jetbrains.kotlin.resolve.bindingContextUtil.recordScopeAndDataFlowInfo
 import kotlin.properties.Delegates
+import org.jetbrains.kotlin.resolve.descriptorUtil.classObjectDescriptor
 
 public trait Qualifier: ReceiverValue {
 
@@ -81,8 +82,8 @@ class QualifierReceiver (
         if (classifier is ClassDescriptor) {
             scopes.add(classifier.getStaticScope())
 
-            val classObjectDescriptor = classifier.getClassObjectDescriptor()
+            val classObjectDescriptor = classifier.getDefaultObjectDescriptor()
-            if (classObjectDescriptor != null && DescriptorUtils.isClassObject(classObjectDescriptor)) {
+            if (classObjectDescriptor != null) {
                 // non-static members are resolved through class object receiver
                 scopes.add(DescriptorUtils.getStaticNestedClassesScope(classObjectDescriptor))
             }
@@ -145,7 +146,7 @@ private fun QualifierReceiver.resolveAsReceiverInQualifiedExpression(context: Ex
     if (classifier is TypeParameterDescriptor) {
         context.trace.report(TYPE_PARAMETER_ON_LHS_OF_DOT.on(referenceExpression, classifier as TypeParameterDescriptor))
     }
-    else if (classifier is ClassDescriptor && classifier.getClassObjectDescriptor() != null) {
+    else if (classifier is ClassDescriptor && classifier.classObjectDescriptor != null) {
         context.trace.record(EXPRESSION_TYPE, referenceExpression, classifier.getClassObjectType())
     }
 }
@@ -173,7 +174,7 @@ private fun QualifierReceiver.resolveReferenceTarget(selector: DeclarationDescri
     if (classifier != null && containingDeclaration is ClassDescriptor && classifier == containingDeclaration) {
         return classifier
     }
-    if (classifier is ClassDescriptor && classifier.getClassObjectDescriptor() != null) {
+    if (classifier is ClassDescriptor && classifier.classObjectDescriptor != null) {
         return classifier.getClassObjectReferenceTarget()
     }
 

compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java

@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler;
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
 import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
-import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
 import org.jetbrains.kotlin.descriptors.PackageViewDescriptor;
 import org.jetbrains.kotlin.resolve.BindingContext;
@@ -146,7 +145,6 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
         for (DeclarationDescriptor descriptor : allDescriptors) {
             assertTrue("Wrong name: " + descriptor, descriptor.getName().asString().equals("Lol"));
             assertTrue("Should be an object: " + descriptor, isObject(descriptor));
-            assertNotNull("Object should have a class object: " + descriptor, ((ClassDescriptor) descriptor).getClassObjectDescriptor());
         }
     }
 

compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java

@@ -201,7 +201,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends JetLiteFix
 
     @NotNull
     private static ClassDescriptor getClassObjectDescriptor(@NotNull ClassDescriptor classDescriptor) {
-        ClassDescriptor objectDescriptor = classDescriptor.getClassObjectDescriptor();
+        ClassDescriptor objectDescriptor = classDescriptor.getDefaultObjectDescriptor();
         assert objectDescriptor != null : "Cannot find class object for class " + classDescriptor.getName();
         return objectDescriptor;
     }

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt

@@ -85,8 +85,7 @@ class LazyJavaClassDescriptor(
 
     override fun getUnsubstitutedPrimaryConstructor(): ConstructorDescriptor? = null
 
-    override fun getClassObjectDescriptor(): ClassDescriptor? = null
+    override fun getDefaultObjectDescriptor(): ClassDescriptor? = null
-    override fun getClassObjectType(): JetType? = getClassObjectDescriptor()?.let { d -> d.getDefaultType() }
 
     override fun getConstructors() = scopeForMemberLookup.constructors()
 

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

@@ -60,8 +60,11 @@ public interface ClassDescriptor extends ClassifierDescriptor, MemberDescriptor,
     @Override
     JetType getClassObjectType();
 
+    /**
+     * @return nested object declared as 'default' if one is present.
+     */
     @Nullable
-    ClassDescriptor getClassObjectDescriptor();
+    ClassDescriptor getDefaultObjectDescriptor();
 
     @NotNull
     ClassKind getKind();

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java

@@ -21,6 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.name.Name;
+import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage;
 import org.jetbrains.kotlin.resolve.scopes.InnerClassesScopeWrapper;
 import org.jetbrains.kotlin.resolve.scopes.JetScope;
 import org.jetbrains.kotlin.resolve.scopes.SubstitutingScope;
@@ -31,8 +32,6 @@ import org.jetbrains.kotlin.types.*;
 import java.util.List;
 import java.util.Map;
 
-import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumClass;
-
 public abstract class AbstractClassDescriptor implements ClassDescriptor {
     private final Name name;
     protected final NotNullLazyValue<JetType> defaultType;
@@ -79,7 +78,7 @@ public abstract class AbstractClassDescriptor implements ClassDescriptor {
     @Nullable
     @Override
     public JetType getClassObjectType() {
-        ClassDescriptor classObject = getClassObjectDescriptor();
+        ClassDescriptor classObject = DescriptorUtilPackage.getClassObjectDescriptor(this);
         return classObject == null ? null : classObject.getDefaultType();
     }
 

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java

@@ -101,7 +101,7 @@ public class ClassDescriptorImpl extends ClassDescriptorBase {
 
     @Nullable
     @Override
-    public ClassDescriptor getClassObjectDescriptor() {
+    public ClassDescriptor getDefaultObjectDescriptor() {
         return null;
     }
 

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java

@@ -47,7 +47,6 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
     private final ConstructorDescriptor primaryConstructor;
     private final JetScope scope;
     private final JetScope staticScope = new StaticScopeForKotlinClass(this);
-    private final ClassDescriptor classObjectDescriptor;
     private final NotNullLazyValue<Collection<Name>> enumMemberNames;
 
     /**
@@ -88,8 +87,6 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
         ConstructorDescriptorImpl primaryConstructor = DescriptorFactory.createPrimaryConstructorForObject(this, source);
         primaryConstructor.setReturnType(getDefaultType());
         this.primaryConstructor = primaryConstructor;
-
-        this.classObjectDescriptor = containingClass;
     }
 
     @NotNull
@@ -118,8 +115,8 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
 
     @Nullable
     @Override
-    public ClassDescriptor getClassObjectDescriptor() {
+    public ClassDescriptor getDefaultObjectDescriptor() {
-        return classObjectDescriptor;
+        return null;
     }
 
     @NotNull

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java

@@ -169,8 +169,8 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor {
     }
 
     @Override
-    public ClassDescriptor getClassObjectDescriptor() {
+    public ClassDescriptor getDefaultObjectDescriptor() {
-        return original.getClassObjectDescriptor();
+        return original.getDefaultObjectDescriptor();
     }
 
     @NotNull

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

@@ -320,10 +320,6 @@ public class DescriptorUtils {
         return superClassDescriptor.equals(KotlinBuiltIns.getInstance().getAny());
     }
 
-    public static boolean isSyntheticClassObject(@NotNull DeclarationDescriptor descriptor) {
-        return isClassObject(descriptor) && isSingleton(descriptor.getContainingDeclaration());
-    }
-
     @NotNull
     public static Visibility getDefaultConstructorVisibility(@NotNull ClassDescriptor classDescriptor) {
         ClassKind classKind = classDescriptor.getKind();
@@ -337,11 +333,6 @@ public class DescriptorUtils {
         return Visibilities.PUBLIC;
     }
 
-    @NotNull
-    public static Visibility getSyntheticClassObjectVisibility() {
-        return Visibilities.PUBLIC;
-    }
-
     @Nullable
     public static ClassDescriptor getInnerClassByName(@NotNull ClassDescriptor classDescriptor, @NotNull String innerClassName) {
         ClassifierDescriptor classifier = classDescriptor.getDefaultType().getMemberScope().getClassifier(Name.identifier(innerClassName));

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

@@ -22,12 +22,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind.*
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.ClassId
 
-public fun ClassDescriptor.getClassObjectReferenceTarget(): ClassDescriptor {
+public fun ClassDescriptor.getClassObjectReferenceTarget(): ClassDescriptor = getDefaultObjectDescriptor() ?: this
-    val classObjectDescriptor = getClassObjectDescriptor()
-    return if (classObjectDescriptor == null || hasSyntheticClassObject()) this else classObjectDescriptor
-}
-
-public fun ClassDescriptor.hasSyntheticClassObject(): Boolean = getKind() in setOf(ENUM_ENTRY, OBJECT)
 
 public fun DeclarationDescriptor.getImportableDescriptor(): DeclarationDescriptor {
     return when {
@@ -60,3 +55,17 @@ public val ClassDescriptor.classId: ClassId
         }
         throw IllegalStateException("Illegal container: $owner")
     }
+
+/** If a literal of this class can be used as a value returns the class which represents the type of this value */
+public val ClassDescriptor.classObjectDescriptor: ClassDescriptor?
+    get() {
+        return when (this.getKind()) {
+            CLASS_OBJECT, OBJECT -> this
+            ENUM_ENTRY -> {
+                val container = this.getContainingDeclaration()
+                assert(container is ClassDescriptor && container.getKind() == ENUM_CLASS)
+                container as ClassDescriptor
+            }
+            else -> getDefaultObjectDescriptor()
+        }
+    }

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

@@ -130,8 +130,8 @@ public class DescriptorSerializer {
             }
         }
 
-        ClassDescriptor classObject = classDescriptor.getClassObjectDescriptor();
+        ClassDescriptor classObject = classDescriptor.getDefaultObjectDescriptor();
-        if (classObject != null && isClassObject(classObject)) {
+        if (classObject != null) {
             builder.setClassObjectName(stringTable.getSimpleNameIndex(classObject.getName()));
         }
 

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

@@ -110,16 +110,13 @@ public class DeserializedClassDescriptor(
     }
 
     private fun computeClassObjectDescriptor(): ClassDescriptor? {
-        if (getKind() == ClassKind.OBJECT || getKind() == ClassKind.CLASS_OBJECT) {
-            return this
-        }
         if (!classProto.hasClassObjectName()) return null
 
         val classObjectName = c.nameResolver.getName(classProto.getClassObjectName())
         return memberScope.getClassifier(classObjectName) as? ClassDescriptor
     }
 
-    override fun getClassObjectDescriptor(): ClassDescriptor? = classObjectDescriptor()
+    override fun getDefaultObjectDescriptor(): ClassDescriptor? = classObjectDescriptor()
 
     private fun computeSuperTypes(): Collection<JetType> {
         val supertypes = ArrayList<JetType>(classProto.getSupertypeCount())

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt

@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder
 import java.util.*
 import org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry
-import org.jetbrains.kotlin.resolve.DescriptorUtils.isSyntheticClassObject
 import org.jetbrains.kotlin.types.error.MissingDependencyErrorClass
 import org.jetbrains.kotlin.resolve.dataClassUtils.isComponentLike
 import org.jetbrains.kotlin.types.isFlexible
@@ -147,8 +146,8 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List<Declara
                 builder.append(" {\n")
                 var firstPassed = false
                 val subindent = indent + "    "
-                val classObject = descriptor.getClassObjectDescriptor()
+                val classObject = descriptor.getDefaultObjectDescriptor()
-                if (classObject != null && !descriptor.getKind().isSingleton() && !isSyntheticClassObject(classObject)) {
+                if (classObject != null) {
                     firstPassed = true
                     builder.append(subindent)
                     appendDescriptor(classObject, subindent)

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.kt

@@ -70,7 +70,7 @@ private class MissingDependencyErrorClassDescriptor(containing: DeclarationDescr
         return this
     }
 
-    override fun getClassObjectDescriptor(): ClassDescriptor? {
+    override fun getDefaultObjectDescriptor(): ClassDescriptor? {
         //NOTE: only used in types and rendered fq name should be the same as of containing class
         return MissingDependencyErrorClassDescriptor(this, fullFqName)
     }

idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt

@@ -85,7 +85,7 @@ class StaticMembers(
 
         classDescriptor.getStaticScope().getAllDescriptors().forEach(::processMember)
 
-        val classObject = classDescriptor.getClassObjectDescriptor()
+        val classObject = classDescriptor.getDefaultObjectDescriptor()
         if (classObject != null) {
             classObject.getDefaultType().getMemberScope().getAllDescriptors()
                     .filter { !it.isExtension }

js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java

@@ -174,7 +174,7 @@ public final class ClassTranslator extends AbstractTranslator {
     private TranslationContext fixContextForClassObjectAccessing(TranslationContext declarationContext) {
         // In Kotlin we can access to class object members without qualifier just by name, but we should translate it to access with FQ name.
         // So create alias for class object receiver parameter.
-        ClassDescriptor classObjectDescriptor = descriptor.getClassObjectDescriptor();
+        ClassDescriptor classObjectDescriptor = descriptor.getDefaultObjectDescriptor();
         if (classObjectDescriptor != null) {
             JsExpression referenceToClass = translateAsFQReference(classObjectDescriptor.getContainingDeclaration(), declarationContext);
             JsExpression classObjectAccessor = Namer.getClassObjectAccessor(referenceToClass);