[Commonizer] Extract creation of CirClass from CirClassFactory

2021-03-05 00:50:39 +03:00
parent fa9285aac7
commit d3c60ab72e
7 changed files with 70 additions and 79 deletions
@@ -5,6 +5,10 @@

 package org.jetbrains.kotlin.descriptors.commonizer.cir

+import org.jetbrains.kotlin.descriptors.ClassKind
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibility
+
 interface CirClass : CirClassifier, CirContainingClass {
    var companion: CirName? // null means no companion object
    val isCompanion: Boolean
@@ -14,4 +18,60 @@ interface CirClass : CirClassifier, CirContainingClass {
    val supertypes: Collection<CirType>

    fun setSupertypes(supertypes: Collection<CirType>)
+
+    companion object {
+        @Suppress("NOTHING_TO_INLINE")
+        inline fun create(
+            annotations: List<CirAnnotation>,
+            name: CirName,
+            typeParameters: List<CirTypeParameter>,
+            visibility: Visibility,
+            modality: Modality,
+            kind: ClassKind,
+            companion: CirName?,
+            isCompanion: Boolean,
+            isData: Boolean,
+            isInline: Boolean,
+            isInner: Boolean,
+            isExternal: Boolean
+        ): CirClass = CirClassImpl(
+            annotations = annotations,
+            name = name,
+            typeParameters = typeParameters,
+            visibility = visibility,
+            modality = modality,
+            kind = kind,
+            companion = companion,
+            isCompanion = isCompanion,
+            isData = isData,
+            isInline = isInline,
+            isInner = isInner,
+            isExternal = isExternal
+        )
+    }
+}
+
+data class CirClassImpl(
+    override val annotations: List<CirAnnotation>,
+    override val name: CirName,
+    override val typeParameters: List<CirTypeParameter>,
+    override val visibility: Visibility,
+    override val modality: Modality,
+    override val kind: ClassKind,
+    override var companion: CirName?,
+    override val isCompanion: Boolean,
+    override val isData: Boolean,
+    override val isInline: Boolean,
+    override val isInner: Boolean,
+    override val isExternal: Boolean,
+) : CirClass {
+    private var _supertypes: Collection<CirType>? = null
+
+    override val supertypes: Collection<CirType>
+        get() = _supertypes.orEmpty()
+
+    override fun setSupertypes(supertypes: Collection<CirType>) {
+        check(_supertypes == null)
+        _supertypes = supertypes
+    }
 }
@@ -12,9 +12,10 @@ import kotlinx.metadata.klib.annotations
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibilities
-import org.jetbrains.kotlin.descriptors.Visibility
-import org.jetbrains.kotlin.descriptors.commonizer.cir.*
-import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassImpl
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClass
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassType
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirEntityId
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirName
 import org.jetbrains.kotlin.descriptors.commonizer.metadata.decodeClassKind
 import org.jetbrains.kotlin.descriptors.commonizer.metadata.decodeModality
 import org.jetbrains.kotlin.descriptors.commonizer.metadata.decodeVisibility
@@ -22,7 +23,7 @@ import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMap
 import org.jetbrains.kotlin.descriptors.commonizer.utils.filteredSupertypes

 object CirClassFactory {
-    fun create(name: CirName, source: KmClass, typeResolver: CirTypeResolver): CirClass = create(
+    fun create(name: CirName, source: KmClass, typeResolver: CirTypeResolver): CirClass = CirClass.create(
        annotations = CirAnnotationFactory.createAnnotations(source.flags, typeResolver, source::annotations),
        name = name,
        typeParameters = source.typeParameters.compactMap { CirTypeParameterFactory.create(it, typeResolver) },
@@ -45,7 +46,7 @@ object CirClassFactory {
        enumClassId: CirEntityId,
        enumClass: KmClass,
        typeResolver: CirTypeResolver
-    ): CirClass = create(
+    ): CirClass = CirClass.create(
        annotations = annotations.compactMap { CirAnnotationFactory.create(it, typeResolver) },
        name = name,
        typeParameters = emptyList(),
@@ -68,35 +69,4 @@ object CirClassFactory {
        )
        setSupertypes(listOf(enumClassType))
    }
-
-    @Suppress("NOTHING_TO_INLINE")
-    inline fun create(
-        annotations: List<CirAnnotation>,
-        name: CirName,
-        typeParameters: List<CirTypeParameter>,
-        visibility: Visibility,
-        modality: Modality,
-        kind: ClassKind,
-        companion: CirName?,
-        isCompanion: Boolean,
-        isData: Boolean,
-        isInline: Boolean,
-        isInner: Boolean,
-        isExternal: Boolean
-    ): CirClass {
-        return CirClassImpl(
-            annotations = annotations,
-            name = name,
-            typeParameters = typeParameters,
-            visibility = visibility,
-            modality = modality,
-            kind = kind,
-            companion = companion,
-            isCompanion = isCompanion,
-            isData = isData,
-            isInline = isInline,
-            isInner = isInner,
-            isExternal = isExternal
-        )
-    }
 }
@@ -1,36 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.descriptors.commonizer.cir.impl
-
-import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibility
-import org.jetbrains.kotlin.descriptors.commonizer.cir.*
-
-data class CirClassImpl(
-    override val annotations: List<CirAnnotation>,
-    override val name: CirName,
-    override val typeParameters: List<CirTypeParameter>,
-    override val visibility: Visibility,
-    override val modality: Modality,
-    override val kind: ClassKind,
-    override var companion: CirName?,
-    override val isCompanion: Boolean,
-    override val isData: Boolean,
-    override val isInline: Boolean,
-    override val isInner: Boolean,
-    override val isExternal: Boolean,
-) : CirClass {
-    private var _supertypes: Collection<CirType>? = null
-
-    override val supertypes: Collection<CirType>
-        get() = _supertypes.orEmpty()
-
-    override fun setSupertypes(supertypes: Collection<CirType>) {
-        check(_supertypes == null)
-        _supertypes = supertypes
-    }
-}
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.descriptors.commonizer.core
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClass
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirName
-import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirClassFactory
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirKnownClassifiers

 class ClassCommonizer(classifiers: CirKnownClassifiers) : AbstractStandardCommonizer<CirClass, CirClass>() {
@@ -21,7 +20,7 @@ class ClassCommonizer(classifiers: CirKnownClassifiers) : AbstractStandardCommon
    private var isInline = false
    private var isCompanion = false

-    override fun commonizationResult() = CirClassFactory.create(
+    override fun commonizationResult() = CirClass.create(
        annotations = emptyList(),
        name = name,
        typeParameters = typeParameters.result,
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.descriptors.commonizer.core
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.commonizer.cir.*
-import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirClassFactory
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirKnownClassifiers

 /**
@@ -112,7 +111,7 @@ private class TypeAliasExpectClassCommonizer : AbstractStandardCommonizer<CirTyp
    private lateinit var name: CirName
    private val classVisibility = VisibilityCommonizer.equalizing()

-    override fun commonizationResult(): CirClass = CirClassFactory.create(
+    override fun commonizationResult(): CirClass = CirClass.create(
        annotations = emptyList(),
        name = name,
        typeParameters = emptyList(),
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.descriptors.commonizer.cir.*
-import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirClassFactory
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.*
 import org.jetbrains.kotlin.descriptors.commonizer.utils.isUnderStandardKotlinPackages
 import org.jetbrains.kotlin.descriptors.commonizer.utils.mockClassType
@@ -474,7 +473,7 @@ class TypeCommonizerTest : AbstractCommonizerTest<CirType, CirType>() {
                            classId = type.classifierId
                        )
                    }
-                    node.targetDeclarations[index] = CirClassFactory.create(
+                    node.targetDeclarations[index] = CirClass.create(
                        annotations = emptyList(),
                        name = type.classifierId.relativeNameSegments.last(),
                        typeParameters = emptyList(),
@@ -56,7 +56,7 @@ internal val MOCK_CLASSIFIERS = CirKnownClassifiers(
        private val MOCK_CLASS_NODE = CirClassNode(
            CommonizedGroup(0),
            LockBasedStorageManager.NO_LOCKS.createNullableLazyValue {
-                CirClassFactory.create(
+                CirClass.create(
                    annotations = emptyList(),
                    name = CirName.create("Any"),
                    typeParameters = emptyList(),