IR metadata source: do not require descriptor in property metadata

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt

@@ -660,7 +660,7 @@ class Fir2IrDeclarationStorage(
                     it.populateOverriddenSymbols(thisReceiverOwner)
                 }
             }.apply {
-                metadata = FirMetadataSource.Property(property, descriptor)
+                metadata = FirMetadataSource.Property(property)
             }
         }
     }
@@ -708,7 +708,7 @@ class Fir2IrDeclarationStorage(
                     isExpect = property.isExpect,
                     isFakeOverride = origin == IrDeclarationOrigin.FAKE_OVERRIDE
                 ).apply {
-                    metadata = FirMetadataSource.Variable(property, descriptor)
+                    metadata = FirMetadataSource.Variable(property)
                     enterScope(this)
                     if (irParent != null) {
                         parent = irParent
@@ -794,7 +794,7 @@ class Fir2IrDeclarationStorage(
                     isStatic = field.isStatic,
                     isFakeOverride = false
                 ).apply {
-                    metadata = FirMetadataSource.Variable(field, descriptor)
+                    metadata = FirMetadataSource.Variable(field)
                     descriptor.bind(this)
                     fieldCache[field] = this
                 }

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/FirMetadataSource.kt

@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.fir.backend
 
-import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.MetadataSource
@@ -44,17 +43,22 @@ interface FirMetadataSource : MetadataSource {
     }
 
     class Property(
-        val property: FirProperty, descriptor: PropertyDescriptor
+        val property: FirProperty
-    ) : MetadataSource.Property(descriptor), FirMetadataSource {
+    ) : FirMetadataSource {
         override val session: FirSession
             get() = property.session
+
+        override val name: Name
+            get() = property.name
     }
 
     class Variable(
-        val variable: FirVariable<*>,
+        val variable: FirVariable<*>
-        descriptor: PropertyDescriptor
+    ) : FirMetadataSource {
-    ) : MetadataSource.Property(descriptor), FirMetadataSource {
         override val session: FirSession
             get() = variable.session
+
+        override val name: Name
+            get() = variable.name
     }
 }

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/DescriptorBasedClassCodegen.kt

@@ -134,7 +134,7 @@ class DescriptorBasedClassCodegen internal constructor(
     }
 
     override fun bindFieldMetadata(field: IrField, fieldType: Type, fieldName: String) {
-        val descriptor = field.metadata?.descriptor
+        val descriptor = (field.metadata as? MetadataSource.Property)?.descriptor
         if (descriptor != null) {
             state.globalSerializationBindings.put(JvmSerializationBindings.FIELD_FOR_PROPERTY, descriptor, fieldType to fieldName)
         }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/declarations/IrFieldBuilder.kt

@@ -17,7 +17,7 @@ class IrFieldBuilder : IrDeclarationBuilder() {
     var isExternal: Boolean = false
     var isStatic: Boolean = false
     var isFakeOverride: Boolean = false
-    var metadata: MetadataSource.Property? = null
+    var metadata: MetadataSource? = null
 
     fun updateFrom(from: IrField) {
         super.updateFrom(from)

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt

@@ -27,5 +27,5 @@ interface IrField :
 
     var correspondingPropertySymbol: IrPropertySymbol?
 
-    override val metadata: MetadataSource.Property?
+    override val metadata: MetadataSource?
 }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt

@@ -104,9 +104,9 @@ class IrFieldImpl(
             }
         }
 
-    override var metadataField: MetadataSource.Property? = null
+    override var metadataField: MetadataSource? = null
 
-    override var metadata: MetadataSource.Property?
+    override var metadata: MetadataSource?
         get() = getCarrier().metadataField
         set(v) {
             if (metadata !== v) {

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/FieldCarrier.kt

@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
 interface FieldCarrier : DeclarationCarrier<FieldCarrier> {
     var initializerField: IrExpressionBody?
     var correspondingPropertySymbolField: IrPropertySymbol?
-    var metadataField: MetadataSource.Property?
+    var metadataField: MetadataSource?
     var overridenSymbolsField: List<IrFieldSymbol>
 
     override fun clone(): FieldCarrier {
@@ -40,6 +40,6 @@ class FieldCarrierImpl(
     override var annotationsField: List<IrConstructorCall>,
     override var initializerField: IrExpressionBody?,
     override var correspondingPropertySymbolField: IrPropertySymbol?,
-    override var metadataField: MetadataSource.Property?,
+    override var metadataField: MetadataSource?,
     override var overridenSymbolsField: List<IrFieldSymbol>
 ): FieldCarrier