From 43bb60addba2caaa2a12f9775a9625830d53d7e6 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 26 Jun 2020 11:11:46 +0300 Subject: [PATCH] [FIR] Remove workaround for KT-39659 --- .../deserialization/JvmBinaryAnnotationDeserializer.kt | 9 --------- 1 file changed, 9 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 2ecf2a057d7..528ca2b24bc 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 @@ -126,15 +126,6 @@ class JvmBinaryAnnotationDeserializer( } is ProtoBuf.Function -> { val signature = JvmProtoBufUtil.getJvmMethodSignature(proto, nameResolver, typeTable) ?: return null - // TODO: Investigate why annotations for accessors affect resolution, resulting in dangling type parameter. - // regressions: Fir2IrTextTest.Declarations.test*LevelProperties - // This is necessary because of libraries/stdlib/src/kotlin/collections/MapAccessors.kt:43 as - // we now load that overload as low-priority and choose another one, but we don't support @Exact yet - // that is necessary to correctly resolve the latter - // See KT-39659 - if (signature.name.startsWith("getVarContravariant")) { - return null - } MemberSignature.fromJvmMemberSignature(signature) } is ProtoBuf.Property -> {