Extract common logic into AbstractTypeConstructor

Mostly it's about detecting loops in supertypes

Test data changes:
- Loops are being disconnected in Java classes too
- functions.kt: loops disconnection mechanism runs supertypes calculation,
so when we start check T it forces F' supertypes calculation, that ends
with CYCLIC_GENERIC_UPPER_BOUND reported on F

 #KT-11287 In Progress

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

@@ -137,28 +137,6 @@ class DeserializedClassDescriptor(
 
     override fun getCompanionObjectDescriptor(): ClassDescriptor? = companionObjectDescriptor()
 
-    private fun computeSupertypes(): Collection<KotlinType> {
-        val result = ArrayList<KotlinType>(classProto.supertypeCount)
-        val unresolved = ArrayList<DeserializedType>(0)
-
-        for (supertypeProto in classProto.supertypes(c.typeTable)) {
-            val supertype = c.typeDeserializer.type(supertypeProto)
-            if (supertype.isError) {
-                unresolved.add(supertype.upperIfFlexible() as? DeserializedType ?: error("Not a deserialized type: $supertype"))
-            }
-            else {
-                result.add(supertype)
-            }
-        }
-
-        result.addAll(c.components.additionalSupertypes.forClass(this))
-
-        if (unresolved.isNotEmpty()) {
-            c.components.errorReporter.reportIncompleteHierarchy(this, unresolved.map(DeserializedType::getPresentableText))
-        }
-
-        return result.toReadOnlyList()
-    }
 
     internal fun hasNestedClass(name: Name): Boolean {
         return name in nestedClasses.nestedClassNames
@@ -170,18 +148,36 @@ class DeserializedClassDescriptor(
 
     override fun getDeclaredTypeParameters() = c.typeDeserializer.ownTypeParameters
 
-    private inner class DeserializedClassTypeConstructor : AbstractClassTypeConstructor() {
-        private val supertypes = c.storageManager.createLazyValue {
-            computeSupertypes()
-        }
-
+    private inner class DeserializedClassTypeConstructor : AbstractClassTypeConstructor(c.storageManager) {
         private val parameters = c.storageManager.createLazyValue {
             this@DeserializedClassDescriptor.computeConstructorTypeParameters()
         }
 
-        override fun getParameters() = parameters()
+        override fun computeSupertypes(): Collection<KotlinType> {
+            val result = ArrayList<KotlinType>(classProto.supertypeCount)
+            val unresolved = ArrayList<DeserializedType>(0)
 
-        override fun getSupertypes() = supertypes()
+            for (supertypeProto in classProto.supertypes(c.typeTable)) {
+                val supertype = c.typeDeserializer.type(supertypeProto)
+                if (supertype.isError) {
+                    unresolved.add(supertype.upperIfFlexible() as? DeserializedType ?: error("Not a deserialized type: $supertype"))
+                }
+                else {
+                    result.add(supertype)
+                }
+            }
+
+            result.addAll(c.components.additionalSupertypes.forClass(this@DeserializedClassDescriptor))
+
+            if (unresolved.isNotEmpty()) {
+                c.components.errorReporter.reportIncompleteHierarchy(
+                        this@DeserializedClassDescriptor, unresolved.map(DeserializedType::getPresentableText))
+            }
+
+            return result.toReadOnlyList()
+        }
+
+        override fun getParameters() = parameters()
 
         override fun isFinal(): Boolean = isFinalClass
 
@@ -192,6 +188,10 @@ class DeserializedClassDescriptor(
         override fun getAnnotations(): Annotations = Annotations.EMPTY // TODO
 
         override fun toString() = getName().toString()
+
+        override val supertypeLoopChecker: SupertypeLoopChecker
+            // TODO: inject implementation
+            get() = SupertypeLoopChecker.EMPTY
     }
 
     private inner class DeserializedClassMemberScope : DeserializedMemberScope(c, classProto.functionList, classProto.propertyList) {

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

@@ -34,7 +34,7 @@ class DeserializedTypeParameterDescriptor(
         index: Int
 ) : AbstractLazyTypeParameterDescriptor(
         c.storageManager, c.containingDeclaration, c.nameResolver.getName(proto.name),
-        Deserialization.variance(proto.variance), proto.reified, index, SourceElement.NO_SOURCE
+        Deserialization.variance(proto.variance), proto.reified, index, SourceElement.NO_SOURCE, SupertypeLoopChecker.EMPTY
 ) {
     private val annotations = DeserializedAnnotationsWithPossibleTargets(c.storageManager) {
         c.components.annotationAndConstantLoader
@@ -54,8 +54,6 @@ class DeserializedTypeParameterDescriptor(
         }
     }
 
-    override fun getSupertypeLoopChecker() = SupertypeLoopChecker.EMPTY
-
-    override fun reportCycleError(type: KotlinType) = throw IllegalStateException(
+    override fun reportSupertypeLoopError(type: KotlinType) = throw IllegalStateException(
             "There should be no cycles for deserialized type parameters, but found for: $this")
 }