From 20ab88c001b53a368e44e888329e4446a26745db Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Fri, 5 Mar 2021 01:16:21 +0300
Subject: [PATCH] [Commonizer] Extract CirStandardTypes from CirTypeFactory

---
 .../commonizer/cir/CirStandardTypes.kt        | 19 +++++++++++++++++++
 .../commonizer/cir/factory/CirTypeFactory.kt  | 11 -----------
 .../commonizer/metadata/entityBuilders.kt     |  3 +--
 3 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirStandardTypes.kt

diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirStandardTypes.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirStandardTypes.kt
new file mode 100644
index 00000000000..9943e538ade
--- /dev/null
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirStandardTypes.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2010-2021 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
+
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.commonizer.utils.ANY_CLASS_ID
+
+object CirStandardTypes {
+    val ANY: CirClassType = CirClassType.createInterned(
+        classId = ANY_CLASS_ID,
+        outerType = null,
+        visibility = Visibilities.Public,
+        arguments = emptyList(),
+        isMarkedNullable = false
+    )
+}
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt
index 758570cc2d5..ae0c5800d89 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.factory
 
 import gnu.trove.TIntObjectHashMap
 import kotlinx.metadata.*
-import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.descriptors.commonizer.cir.*
 import org.jetbrains.kotlin.descriptors.commonizer.core.computeExpandedType
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirProvided
@@ -19,16 +18,6 @@ import org.jetbrains.kotlin.descriptors.commonizer.utils.*
 import org.jetbrains.kotlin.types.Variance
 
 object CirTypeFactory {
-    object StandardTypes {
-        val ANY: CirClassType = CirClassType.createInterned(
-            classId = ANY_CLASS_ID,
-            outerType = null,
-            visibility = Visibilities.Public,
-            arguments = emptyList(),
-            isMarkedNullable = false
-        )
-    }
-
     fun create(source: KmType, typeResolver: CirTypeResolver): CirType {
         @Suppress("NAME_SHADOWING")
         val source = source.abbreviatedType ?: source
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/entityBuilders.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/entityBuilders.kt
index 405c7f4911b..ea93b99a48c 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/entityBuilders.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/entityBuilders.kt
@@ -10,7 +10,6 @@ import kotlinx.metadata.klib.*
 import org.jetbrains.kotlin.backend.common.serialization.metadata.DynamicTypeDeserializer
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.commonizer.cir.*
-import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirTypeFactory
 import org.jetbrains.kotlin.descriptors.commonizer.core.computeExpandedType
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.*
 import org.jetbrains.kotlin.descriptors.commonizer.metadata.TypeAliasExpansion.*
@@ -103,7 +102,7 @@ internal fun CirClass.buildClass(
 
     val supertypes = supertypes
     if (supertypes.isEmpty() && className !in SPECIAL_CLASS_WITHOUT_SUPERTYPES_CLASS_NAMES)
-        clazz.supertypes += CirTypeFactory.StandardTypes.ANY.buildType(context)
+        clazz.supertypes += CirStandardTypes.ANY.buildType(context)
     else
         supertypes.mapTo(clazz.supertypes) { it.buildType(context) }
 }