From b3e68d3704a015ca3094c1a57b6d923db5d8b9e2 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Fri, 19 Feb 2021 23:31:40 +0300
Subject: [PATCH] [Commonizer] Make
 CirProperty.[backing|delegate]FieldAnnotations non-nullable

There is effectively no difference between missing field and a field with no annotations.
---
 .../kotlin/descriptors/commonizer/cir/CirProperty.kt      | 4 ++--
 .../commonizer/cir/factory/CirPropertyFactory.kt          | 8 ++++----
 .../descriptors/commonizer/cir/impl/CirPropertyImpl.kt    | 4 ++--
 .../descriptors/commonizer/core/PropertyCommonizer.kt     | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirProperty.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirProperty.kt
index 81099e96b84..7519b72b176 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirProperty.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirProperty.kt
@@ -13,7 +13,7 @@ interface CirProperty : CirFunctionOrProperty, CirLiftedUpDeclaration {
     val isDelegate: Boolean
     val getter: CirPropertyGetter?
     val setter: CirPropertySetter?
-    val backingFieldAnnotations: List<CirAnnotation>? // null assumes no backing field
-    val delegateFieldAnnotations: List<CirAnnotation>? // null assumes no backing field
+    val backingFieldAnnotations: List<CirAnnotation>
+    val delegateFieldAnnotations: List<CirAnnotation>
     val compileTimeInitializer: CirConstantValue<*>?
 }
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt
index 86808b55fd7..463dd325afc 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt
@@ -39,8 +39,8 @@ object CirPropertyFactory {
             isDelegate = source.isDelegated,
             getter = source.getter?.let(CirPropertyGetterFactory::create),
             setter = source.setter?.let(CirPropertySetterFactory::create),
-            backingFieldAnnotations = source.backingField?.annotations?.compactMap(CirAnnotationFactory::create),
-            delegateFieldAnnotations = source.delegateField?.annotations?.compactMap(CirAnnotationFactory::create),
+            backingFieldAnnotations = source.backingField?.annotations?.compactMap(CirAnnotationFactory::create).orEmpty(),
+            delegateFieldAnnotations = source.delegateField?.annotations?.compactMap(CirAnnotationFactory::create).orEmpty(),
             compileTimeInitializer = compileTimeInitializer
         )
     }
@@ -63,8 +63,8 @@ object CirPropertyFactory {
         isDelegate: Boolean,
         getter: CirPropertyGetter?,
         setter: CirPropertySetter?,
-        backingFieldAnnotations: List<CirAnnotation>?,
-        delegateFieldAnnotations: List<CirAnnotation>?,
+        backingFieldAnnotations: List<CirAnnotation>,
+        delegateFieldAnnotations: List<CirAnnotation>,
         compileTimeInitializer: CirConstantValue<*>?
     ): CirProperty {
         return CirPropertyImpl(
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt
index b5549c18c04..779f520eb32 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt
@@ -27,8 +27,8 @@ data class CirPropertyImpl(
     override val isDelegate: Boolean,
     override val getter: CirPropertyGetter?,
     override val setter: CirPropertySetter?,
-    override val backingFieldAnnotations: List<CirAnnotation>?,
-    override val delegateFieldAnnotations: List<CirAnnotation>?,
+    override val backingFieldAnnotations: List<CirAnnotation>,
+    override val delegateFieldAnnotations: List<CirAnnotation>,
     override val compileTimeInitializer: CirConstantValue<*>?
 ) : CirProperty {
     // const property in "common" fragment is already lifted up
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt
index fb38ab2ab64..132b35859bd 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt
@@ -45,8 +45,8 @@ class PropertyCommonizer(classifiers: CirKnownClassifiers) : AbstractFunctionOrP
             isDelegate = false,
             getter = CirPropertyGetterFactory.DEFAULT_NO_ANNOTATIONS,
             setter = setter,
-            backingFieldAnnotations = null,
-            delegateFieldAnnotations = null,
+            backingFieldAnnotations = emptyList(),
+            delegateFieldAnnotations = emptyList(),
             compileTimeInitializer = constCompileTimeInitializer
         )
     }