From e2cc0510dee7d217a3d05838e8580a84867f944f Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Thu, 8 Apr 2021 13:38:14 +0300
Subject: [PATCH] Rewrite FirDeclarationDataRegistry.data to avoid type
 parameter problems

---
 .../jetbrains/kotlin/fir/utils/ArrayMapOwner.kt |  4 ++++
 .../fir/scopes/impl/FirDelegatedMemberScope.kt  |  2 --
 .../impl/FirObjectImportedCallableScope.kt      |  1 -
 .../org/jetbrains/kotlin/fir/ClassMembers.kt    |  2 --
 .../declarations/FirDeclarationAttributes.kt    | 17 +++++++++--------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMapOwner.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMapOwner.kt
index fc701c07f6a..01f64db8bff 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMapOwner.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMapOwner.kt
@@ -66,6 +66,10 @@ abstract class TypeRegistry<K : Any, V : Any> {
         return NullableArrayMapAccessor(kClass, getId(kClass))
     }
 
+    fun <KK : K> generateAnyNullableAccessor(kClass: KClass<KK>): NullableArrayMapAccessor<K, V, *> {
+        return NullableArrayMapAccessor(kClass, getId(kClass))
+    }
+
     fun <T : K> getId(kClass: KClass<T>): Int {
         return idPerType.computeIfAbsent(kClass) { idCounter.getAndIncrement() }
     }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
index 5094cd2a143..79872d2eac4 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
@@ -162,8 +162,6 @@ class DelegatedWrapperData<D : FirCallableDeclaration<*>>(
     val containingClass: ConeClassLikeLookupTag,
     val delegateField: FirField,
 )
-
-@Suppress("DELEGATE_USES_EXTENSION_PROPERTY_TYPE_PARAMETER")
 var <D : FirCallableDeclaration<*>>
         D.delegatedWrapperData: DelegatedWrapperData<D>? by FirDeclarationDataRegistry.data(DelegatedWrapperDataKey)
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt
index 9d3f77dc986..4e29e149e3c 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt
@@ -63,6 +63,5 @@ class ImportedFromObjectData<D : FirCallableDeclaration<*>>(
     val original: D,
 )
 
-@Suppress("DELEGATE_USES_EXTENSION_PROPERTY_TYPE_PARAMETER")
 var <D : FirCallableDeclaration<*>>
         D.importedFromObjectData: ImportedFromObjectData<D>? by FirDeclarationDataRegistry.data(ImportedFromObjectClassIdKey)
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/ClassMembers.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/ClassMembers.kt
index 1322b844198..47236efb14b 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/ClassMembers.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/ClassMembers.kt
@@ -80,13 +80,11 @@ inline fun <reified S : FirCallableSymbol<*>> S.unwrapFakeOverrides(): S = fir.u
 
 private object SubstitutedOverrideOriginalKey : FirDeclarationDataKey()
 
-@Suppress("DELEGATE_USES_EXTENSION_PROPERTY_TYPE_PARAMETER")
 var <D : FirCallableDeclaration<*>>
         D.originalForSubstitutionOverrideAttr: D? by FirDeclarationDataRegistry.data(SubstitutedOverrideOriginalKey)
 
 private object IntersectionOverrideOriginalKey : FirDeclarationDataKey()
 
-@Suppress("DELEGATE_USES_EXTENSION_PROPERTY_TYPE_PARAMETER")
 var <D : FirCallableDeclaration<*>>
         D.originalForIntersectionOverrideAttr: D? by FirDeclarationDataRegistry.data(IntersectionOverrideOriginalKey)
 
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationAttributes.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationAttributes.kt
index 698e7ffd4ef..08db07b21fb 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationAttributes.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationAttributes.kt
@@ -40,9 +40,9 @@ class FirDeclarationAttributes : AttributeArrayOwner<FirDeclarationDataKey, Any>
  *    var FirDeclaration.someString: String? by FirDeclarationDataRegistry.data(SomeKey)
  */
 object FirDeclarationDataRegistry : TypeRegistry<FirDeclarationDataKey, Any>() {
-    fun <K : FirDeclarationDataKey, V : Any> data(key: K): ReadWriteProperty<FirDeclaration, V?> {
+    fun <K : FirDeclarationDataKey> data(key: K): DeclarationDataAccessor {
         val kClass = key::class
-        return DeclarationDataAccessor(generateNullableAccessor(kClass), kClass)
+        return DeclarationDataAccessor(generateAnyNullableAccessor(kClass), kClass)
     }
 
     fun <K : FirDeclarationDataKey, V : Any> attributesAccessor(key: K): ReadWriteProperty<FirDeclarationAttributes, V?> {
@@ -50,15 +50,16 @@ object FirDeclarationDataRegistry : TypeRegistry<FirDeclarationDataKey, Any>() {
         return AttributeDataAccessor(generateNullableAccessor(kClass), kClass)
     }
 
-    private class DeclarationDataAccessor<V : Any>(
-        val dataAccessor: NullableArrayMapAccessor<FirDeclarationDataKey, Any, V>,
+    class DeclarationDataAccessor(
+        private val dataAccessor: NullableArrayMapAccessor<FirDeclarationDataKey, Any, *>,
         val key: KClass<out FirDeclarationDataKey>
-    ) : ReadWriteProperty<FirDeclaration, V?> {
-        override fun getValue(thisRef: FirDeclaration, property: KProperty<*>): V? {
-            return dataAccessor.getValue(thisRef.attributes, property)
+    ) {
+        operator fun <V> getValue(thisRef: FirDeclaration, property: KProperty<*>): V? {
+            @Suppress("UNCHECKED_CAST")
+            return dataAccessor.getValue(thisRef.attributes, property) as? V
         }
 
-        override fun setValue(thisRef: FirDeclaration, property: KProperty<*>, value: V?) {
+        operator fun <V> setValue(thisRef: FirDeclaration, property: KProperty<*>, value: V?) {
             thisRef.attributes[key] = value
         }
     }