[klib] Serialized mangled names of declarations along with signatures

^KT-59486 Fixed

compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt

@@ -215,6 +215,10 @@ open class IrFileSerializer(
             proto.flags = signature.mask
         }
 
+        if (addDebugInfo) {
+            signature.description?.let { proto.debugInfo = serializeDebugInfo(it) }
+        }
+
         return proto.build()
     }
 
@@ -228,6 +232,9 @@ open class IrFileSerializer(
             if (mask != 0L) {
                 proto.flags = mask
             }
+            if (addDebugInfo) {
+                description?.let { proto.debugInfo = serializeDebugInfo(it) }
+            }
         }
 
         return proto.build()

compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureBuilder.kt

@@ -74,7 +74,7 @@ abstract class IdSignatureBuilder<D> {
                     declarationFqName = classFqName,
                     id = hashId,
                     mask = mask,
-                    description = null, // TODO(KT-59486): Save mangled name here
+                    description = description,
                 )
             }
             else -> {
@@ -83,7 +83,7 @@ abstract class IdSignatureBuilder<D> {
                     declarationFqName = classFqName,
                     id = hashIdAcc,
                     mask = mask,
-                    description = null, // TODO(KT-59486): Save mangled name here
+                    description = description,
                 )
                 hashIdAcc = null
                 classFqnSegments.run { removeAt(lastIndex) }

compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureDescriptor.kt

@@ -23,6 +23,19 @@ open class IdSignatureDescriptor(override val mangler: KotlinMangler.DescriptorM
         IdSignatureBuilder<DeclarationDescriptor>(),
         DeclarationDescriptorVisitor<Unit, Nothing?> {
 
+        private fun setHashIdFor(declaration: DeclarationDescriptor, isPropertyAccessor: Boolean) {
+            mangler.run {
+                val mangledName = declaration.signatureString(compatibleMode = false)
+                val id = mangledName.hashMangle
+                if (isPropertyAccessor) {
+                    hashIdAcc = id
+                } else {
+                    hashId = id
+                }
+                description = mangledName
+            }
+        }
+
         override fun accept(d: DeclarationDescriptor) {
             d.accept(this, null)
         }
@@ -71,7 +84,7 @@ open class IdSignatureDescriptor(override val mangler: KotlinMangler.DescriptorM
 
         override fun visitFunctionDescriptor(descriptor: FunctionDescriptor, data: Nothing?) {
             collectParents(descriptor)
-            hashId = mangler.run { descriptor.signatureMangle(compatibleMode = false) }
+            setHashIdFor(descriptor, isPropertyAccessor = false)
             isTopLevelPrivate = isTopLevelPrivate or descriptor.isTopLevelPrivate
             setDescription(descriptor)
             setExpected(descriptor.isExpect)
@@ -115,7 +128,7 @@ open class IdSignatureDescriptor(override val mangler: KotlinMangler.DescriptorM
 
         override fun visitConstructorDescriptor(constructorDescriptor: ConstructorDescriptor, data: Nothing?) {
             collectParents(constructorDescriptor)
-            hashId = mangler.run { constructorDescriptor.signatureMangle(compatibleMode = false) }
+            setHashIdFor(constructorDescriptor, isPropertyAccessor = false)
             platformSpecificConstructor(constructorDescriptor)
         }
 
@@ -131,8 +144,7 @@ open class IdSignatureDescriptor(override val mangler: KotlinMangler.DescriptorM
             collectParents(actualDeclaration)
             isTopLevelPrivate = isTopLevelPrivate or actualDeclaration.isTopLevelPrivate
 
-
-            hashId = mangler.run { actualDeclaration.signatureMangle(compatibleMode = false) }
+            setHashIdFor(actualDeclaration, isPropertyAccessor = false)
             setExpected(actualDeclaration.isExpect)
             platformSpecificProperty(actualDeclaration)
             if (type == SpecialDeclarationType.BACKING_FIELD) {
@@ -149,7 +161,7 @@ open class IdSignatureDescriptor(override val mangler: KotlinMangler.DescriptorM
 
         override fun visitPropertyGetterDescriptor(descriptor: PropertyGetterDescriptor, data: Nothing?) {
             descriptor.correspondingProperty.accept(this, null)
-            hashIdAcc = mangler.run { descriptor.signatureMangle(compatibleMode = false) }
+            setHashIdFor(descriptor, isPropertyAccessor = true)
             classFqnSegments.add(descriptor.name.asString())
             setExpected(descriptor.isExpect)
             platformSpecificGetter(descriptor)
@@ -157,7 +169,7 @@ open class IdSignatureDescriptor(override val mangler: KotlinMangler.DescriptorM
 
         override fun visitPropertySetterDescriptor(descriptor: PropertySetterDescriptor, data: Nothing?) {
             descriptor.correspondingProperty.accept(this, null)
-            hashIdAcc = mangler.run { descriptor.signatureMangle(compatibleMode = false) }
+            setHashIdFor(descriptor, isPropertyAccessor = true)
             classFqnSegments.add(descriptor.name.asString())
             setExpected(descriptor.isExpect)
             platformSpecificSetter(descriptor)