From fdee49ee59ca02072b7cb9912d224da9224e4a11 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Wed, 7 Jul 2021 16:43:38 +0200
Subject: [PATCH] [Commonizer] Drop CirTypeParameter interface for plain data
 class

---
 .../kotlin/commonizer/cir/CirTypeParameter.kt | 33 +++----------------
 .../core/TypeParameterCommonizer.kt           |  2 +-
 .../commonizer/metadata/CirDeserializers.kt   |  2 +-
 .../core/TypeParameterCommonizerTest.kt       |  2 +-
 4 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirTypeParameter.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirTypeParameter.kt
index 2ac363cf273..9a96509b37b 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirTypeParameter.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirTypeParameter.kt
@@ -7,33 +7,10 @@ package org.jetbrains.kotlin.commonizer.cir
 
 import org.jetbrains.kotlin.types.Variance
 
-interface CirTypeParameter : CirHasAnnotations, CirHasName {
-    val isReified: Boolean
-    val variance: Variance
-    val upperBounds: List<CirType>
-
-    companion object {
-        @Suppress("NOTHING_TO_INLINE")
-        inline fun create(
-            annotations: List<CirAnnotation>,
-            name: CirName,
-            isReified: Boolean,
-            variance: Variance,
-            upperBounds: List<CirType>
-        ): CirTypeParameter = CirTypeParameterImpl(
-            annotations = annotations,
-            name = name,
-            isReified = isReified,
-            variance = variance,
-            upperBounds = upperBounds
-        )
-    }
-}
-
-data class CirTypeParameterImpl(
+data class CirTypeParameter(
     override val annotations: List<CirAnnotation>,
     override val name: CirName,
-    override val isReified: Boolean,
-    override val variance: Variance,
-    override val upperBounds: List<CirType>
-) : CirTypeParameter
+    val isReified: Boolean,
+    val variance: Variance,
+    val upperBounds: List<CirType>
+) : CirHasAnnotations, CirHasName
diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeParameterCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeParameterCommonizer.kt
index 56fe1440499..50d554bd134 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeParameterCommonizer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeParameterCommonizer.kt
@@ -17,7 +17,7 @@ class TypeParameterCommonizer(classifiers: CirKnownClassifiers) : AbstractStanda
     private lateinit var variance: Variance
     private val upperBounds = TypeParameterUpperBoundsCommonizer(classifiers)
 
-    override fun commonizationResult() = CirTypeParameter.create(
+    override fun commonizationResult() = CirTypeParameter(
         annotations = emptyList(),
         name = name,
         isReified = isReified,
diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt
index 772a5e42896..ef193a6fc3e 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt
@@ -73,7 +73,7 @@ object CirDeserializers {
 
     private val ALWAYS_HAS_ANNOTATIONS: Flags = flagsOf(Flag.Common.HAS_ANNOTATIONS)
 
-    private fun typeParameter(source: KmTypeParameter, typeResolver: CirTypeResolver): CirTypeParameter = CirTypeParameter.create(
+    private fun typeParameter(source: KmTypeParameter, typeResolver: CirTypeResolver): CirTypeParameter = CirTypeParameter(
         annotations = annotations(ALWAYS_HAS_ANNOTATIONS, typeResolver, source::annotations),
         name = CirName.create(source.name),
         isReified = Flag.TypeParameter.IS_REIFIED(source.flags),
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/TypeParameterCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/TypeParameterCommonizerTest.kt
index 653b801e6bd..adce6e80f70 100644
--- a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/TypeParameterCommonizerTest.kt
+++ b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/TypeParameterCommonizerTest.kt
@@ -86,7 +86,7 @@ class TypeParameterCommonizerTest : AbstractCommonizerTest<CirTypeParameter, Cir
             isReified: Boolean = false,
             variance: Variance = Variance.INVARIANT,
             upperBounds: List<String> = listOf("kotlin/Any")
-        ) = CirTypeParameter.create(
+        ) = CirTypeParameter(
             annotations = emptyList(),
             name = CirName.create(name),
             isReified = isReified,