From 179cf303dafcb443369d0dd71b7a4b02b91b7944 Mon Sep 17 00:00:00 2001
From: Igor Yakovlev <igor.yakovlev@jetbrains.com>
Date: Thu, 4 Mar 2021 18:26:30 +0100
Subject: [PATCH] [ULC] Fix annotations with no site for ctor

Fixed #KT-45291
---
 .../kotlin/asJava/classes/ultraLightParameters.kt        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightParameters.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightParameters.kt
index ab899c68609..0d93f84db51 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightParameters.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightParameters.kt
@@ -180,8 +180,13 @@ internal class KtUltraLightParameterForSource(
 
     override val givenAnnotations: List<KtLightAbstractAnnotation>?
         get() {
-            val site = if (kotlinOrigin.hasValOrVar()) AnnotationUseSiteTarget.CONSTRUCTOR_PARAMETER else null
-            return kotlinOrigin.annotationEntries.toLightAnnotations(this, site)
+            return if (kotlinOrigin.hasValOrVar()) {
+                val entriesWithoutJvmField = kotlinOrigin.annotationEntries.filter { it.shortName?.identifier != "JvmField" }
+                entriesWithoutJvmField.toLightAnnotations(this, null) +
+                        entriesWithoutJvmField.toLightAnnotations(this, AnnotationUseSiteTarget.CONSTRUCTOR_PARAMETER)
+            } else {
+                kotlinOrigin.annotationEntries.toLightAnnotations(this, null)
+            }
         }
 
     override fun getText(): String? = kotlinOrigin.text