JVM_IR: fix deserialization of Java static field symbols

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

@@ -117,8 +117,8 @@ class DescriptorByIdSignatureFinder(
                             if (isConstructorName(current)) addAll(classDescriptor.constructors)
                             addAll(memberScope.getContributedFunctions(current, NoLookupLocation.FROM_BACKEND))
                             addAll(memberScope.getContributedVariables(current, NoLookupLocation.FROM_BACKEND))
-                            addAll(classDescriptor.staticScope.getContributedDescriptors { it == current })
                         }
+                        addAll(classDescriptor.staticScope.getContributedDescriptors().filter { it.name == current })
                     }
                 }
             }

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

@@ -443,7 +443,7 @@ class IrBodyDeserializer(
         val origin = if (proto.hasOriginName()) deserializeIrStatementOrigin(proto.originName) else null
 
         val superQualifier = if (access.hasSuper()) {
-            declarationDeserializer.deserializeIrSymbolAndRemap(access.symbol) as IrClassSymbol
+            declarationDeserializer.deserializeIrSymbolAndRemap(access.`super`) as IrClassSymbol
         } else null
         val receiver = if (access.hasReceiver()) {
             deserializeExpression(access.receiver)
@@ -549,7 +549,7 @@ class IrBodyDeserializer(
         val access = proto.fieldAccess
         val symbol = declarationDeserializer.deserializeIrSymbolAndRemap(access.symbol) as IrFieldSymbol
         val superQualifier = if (access.hasSuper()) {
-            declarationDeserializer.deserializeIrSymbolAndRemap(access.symbol) as IrClassSymbol
+            declarationDeserializer.deserializeIrSymbolAndRemap(access.`super`) as IrClassSymbol
         } else null
         val receiver = if (access.hasReceiver()) {
             deserializeExpression(access.receiver)

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

@@ -361,7 +361,9 @@ open class IrFileSerializer(
             is IrReturnableBlockSymbol ->
                 BinarySymbolData.SymbolKind.RETURNABLE_BLOCK_SYMBOL
             is IrFieldSymbol ->
-                if (symbol.owner.correspondingPropertySymbol?.owner.let { it == null || it.isDelegated })
+                if (symbol.owner.correspondingPropertySymbol?.owner.let {
+                        it == null || it.isDelegated || it.getter == null && it.setter == null
+                    })
                     BinarySymbolData.SymbolKind.STANDALONE_FIELD_SYMBOL
                 else
                     BinarySymbolData.SymbolKind.FIELD_SYMBOL