[FE 1.0] Report warning about conflict in inherited members from deserialized dependencies

^KT-51194
^KT-51223 Fixed

core/descriptors/src/org/jetbrains/kotlin/descriptors/descriptorUtil.kt

@@ -86,3 +86,5 @@ fun DeclarationDescriptor.containingPackage(): FqName? {
     require(container is PackageFragmentDescriptor?)
     return container?.fqName
 }
+
+object DeserializedDeclarationsFromSupertypeConflictDataKey : CallableDescriptor.UserDataKey<CallableMemberDescriptor>

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt

@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.impl.AbstractClassDescriptor
 import org.jetbrains.kotlin.descriptors.impl.EnumEntrySyntheticClassDescriptor
+import org.jetbrains.kotlin.descriptors.impl.FunctionDescriptorImpl
 import org.jetbrains.kotlin.descriptors.impl.ReceiverParameterDescriptorImpl
 import org.jetbrains.kotlin.incremental.components.LookupLocation
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
@@ -327,7 +328,9 @@ class DeserializedClassDescriptor(
                         fromSuper: CallableMemberDescriptor,
                         fromCurrent: CallableMemberDescriptor
                     ) {
-                        // TODO report conflicts
+                        if (fromCurrent is FunctionDescriptorImpl) {
+                            fromCurrent.putInUserDataMap(DeserializedDeclarationsFromSupertypeConflictDataKey, fromSuper)
+                        }
                     }
                 })
         }