From 3af937ea9af5d7eaacfa89c0f39536d02729778e Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Thu, 9 Jul 2020 10:05:31 +0700
Subject: [PATCH] [Commonizer] Remove isDefinitelyNotNullType from
 CirSimpleType

---
 .../descriptors/commonizer/builder/builderUtils.kt       | 7 +------
 .../kotlin/descriptors/commonizer/cir/CirType.kt         | 1 -
 .../descriptors/commonizer/cir/factory/CirTypeFactory.kt | 9 +++------
 .../descriptors/commonizer/cir/impl/CirSimpleTypeImpl.kt | 5 +----
 .../descriptors/commonizer/core/AnnotationsCommonizer.kt | 3 +--
 .../kotlin/descriptors/commonizer/core/TypeCommonizer.kt | 5 +----
 6 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt
index b76ab12ba8a..7477dcd9fa7 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt
@@ -132,15 +132,10 @@ internal fun CirSimpleType.buildType(
         kotlinTypeRefiner = null
     )
 
-    val computedType = if (classifier is TypeAliasDescriptor)
+    return if (classifier is TypeAliasDescriptor)
         classifier.underlyingType.withAbbreviation(simpleType)
     else
         simpleType
-
-    return if (isDefinitelyNotNullType)
-        computedType.makeSimpleTypeDefinitelyNotNullOrNotNull()
-    else
-        computedType
 }
 
 internal fun findClassOrTypeAlias(
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt
index bc3bf7d7246..0edb01fe947 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt
@@ -28,7 +28,6 @@ abstract class CirSimpleType : CirType(), CirHasVisibility {
     abstract val classifierId: CirClassifierId
     abstract val arguments: List<CirTypeProjection>
     abstract val isMarkedNullable: Boolean
-    abstract val isDefinitelyNotNullType: Boolean
 }
 
 data class CirFlexibleType(val lowerBound: CirSimpleType, val upperBound: CirSimpleType) : CirType()
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 86ded8ab67c..cd471766cc3 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
@@ -39,8 +39,7 @@ object CirTypeFactory {
                     type = create(projection.type)
                 )
             },
-            isMarkedNullable = abbreviation.isMarkedNullable,
-            isDefinitelyNotNullType = abbreviation.isDefinitelyNotNullType
+            isMarkedNullable = abbreviation.isMarkedNullable
         )
     }
 
@@ -48,16 +47,14 @@ object CirTypeFactory {
         classifierId: CirClassifierId,
         visibility: Visibility,
         arguments: List<CirTypeProjection>,
-        isMarkedNullable: Boolean,
-        isDefinitelyNotNullType: Boolean
+        isMarkedNullable: Boolean
     ): CirSimpleType {
         return interner.intern(
             CirSimpleTypeImpl(
                 classifierId = classifierId,
                 visibility = visibility,
                 arguments = arguments,
-                isMarkedNullable = isMarkedNullable,
-                isDefinitelyNotNullType = isDefinitelyNotNullType
+                isMarkedNullable = isMarkedNullable
             )
         )
     }
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirSimpleTypeImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirSimpleTypeImpl.kt
index 1b5c0e84f32..57d251c4eca 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirSimpleTypeImpl.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirSimpleTypeImpl.kt
@@ -14,8 +14,7 @@ data class CirSimpleTypeImpl(
     override val classifierId: CirClassifierId,
     override val visibility: Visibility, // visibility of the classifier descriptor
     override val arguments: List<CirTypeProjection>,
-    override val isMarkedNullable: Boolean,
-    override val isDefinitelyNotNullType: Boolean
+    override val isMarkedNullable: Boolean
 ) : CirSimpleType() {
     // See also org.jetbrains.kotlin.types.KotlinType.cachedHashCode
     private var cachedHashCode = 0
@@ -24,7 +23,6 @@ data class CirSimpleTypeImpl(
         .appendHashCode(visibility)
         .appendHashCode(arguments)
         .appendHashCode(isMarkedNullable)
-        .appendHashCode(isDefinitelyNotNullType)
 
     override fun hashCode(): Int {
         var currentHashCode = cachedHashCode
@@ -42,7 +40,6 @@ data class CirSimpleTypeImpl(
                     && classifierId == other.classifierId
                     && visibility == other.visibility
                     && arguments == other.arguments
-                    && isDefinitelyNotNullType == other.isDefinitelyNotNullType
         }
         else -> false
     }
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizer.kt
index 0fcac0afb83..3fc3b3cdda6 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizer.kt
@@ -164,8 +164,7 @@ private class DeprecatedAnnotationCommonizer : Commonizer<CirAnnotation, CirAnno
             classifierId = CirClassifierIdFactory.createForClass(classId),
             visibility = Visibilities.PUBLIC,
             arguments = emptyList(),
-            isMarkedNullable = false,
-            isDefinitelyNotNullType = false
+            isMarkedNullable = false
         )
 
         private fun CirAnnotation.getDeprecationMessage(): String? = constantValueArguments.getString(PROPERTY_NAME_MESSAGE)
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizer.kt
index dc9832705b2..4ff0cf25761 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizer.kt
@@ -40,10 +40,7 @@ private fun areSimpleTypesEqual(cache: CirClassifiersCache, a: CirSimpleType, b:
     val bId = b.classifierId
 
     if (a !== b) {
-        if (a.arguments.size != b.arguments.size
-            || a.isMarkedNullable != b.isMarkedNullable
-            || a.isDefinitelyNotNullType != b.isDefinitelyNotNullType
-        ) {
+        if (a.arguments.size != b.arguments.size || a.isMarkedNullable != b.isMarkedNullable) {
             return false
         }