From 6a28558d43c9436d483227065133d0c39318fec0 Mon Sep 17 00:00:00 2001
From: Jinseong Jeon <jsjeon@google.com>
Date: Sun, 14 Jun 2020 21:49:17 -0700
Subject: [PATCH] FIR deserializer: rename a callable kind that represents all
 "others"

---
 .../deserialization/JvmBinaryAnnotationDeserializer.kt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmBinaryAnnotationDeserializer.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmBinaryAnnotationDeserializer.kt
index ae8f299dd59..93262b81eaa 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmBinaryAnnotationDeserializer.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmBinaryAnnotationDeserializer.kt
@@ -35,9 +35,9 @@ class JvmBinaryAnnotationDeserializer(
     private data class MemberAnnotations(val memberAnnotations: Map<MemberSignature, MutableList<FirAnnotationCall>>)
 
     private enum class CallableKind {
-        FUNCTION,
         PROPERTY_GETTER,
-        PROPERTY_SETTER
+        PROPERTY_SETTER,
+        OTHERS
     }
 
     override fun loadTypeAnnotations(typeProto: ProtoBuf.Type, nameResolver: NameResolver): List<FirAnnotationCall> {
@@ -51,7 +51,7 @@ class JvmBinaryAnnotationDeserializer(
         nameResolver: NameResolver,
         typeTable: TypeTable
     ): List<FirAnnotationCall> {
-        val signature = getCallableSignature(constructorProto, nameResolver, typeTable, CallableKind.FUNCTION) ?: return emptyList()
+        val signature = getCallableSignature(constructorProto, nameResolver, typeTable) ?: return emptyList()
         return findJvmBinaryClassAndLoadMemberAnnotations(containerSource, signature)
     }
 
@@ -61,7 +61,7 @@ class JvmBinaryAnnotationDeserializer(
         nameResolver: NameResolver,
         typeTable: TypeTable
     ): List<FirAnnotationCall> {
-        val signature = getCallableSignature(functionProto, nameResolver, typeTable, CallableKind.FUNCTION) ?: return emptyList()
+        val signature = getCallableSignature(functionProto, nameResolver, typeTable) ?: return emptyList()
         return findJvmBinaryClassAndLoadMemberAnnotations(containerSource, signature)
     }
 
@@ -91,7 +91,7 @@ class JvmBinaryAnnotationDeserializer(
         proto: MessageLite,
         nameResolver: NameResolver,
         typeTable: TypeTable,
-        kind: CallableKind
+        kind: CallableKind = CallableKind.OTHERS
     ): MemberSignature? {
         return when (proto) {
             is ProtoBuf.Constructor -> {