From 886c5b74127854208c8151246f27fccf7d26bd0e Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Wed, 18 Jan 2023 20:30:15 +0100 Subject: [PATCH] [AA FIR] avoid 'is resolved' check for annotation calls without arguments ^KT-56046 --- .../kotlin/analysis/api/fir/annotations/firAnnotationUtils.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/firAnnotationUtils.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/firAnnotationUtils.kt index 1e96ad9fae6..6674f3749da 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/firAnnotationUtils.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/firAnnotationUtils.kt @@ -15,13 +15,17 @@ import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation +import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression +import org.jetbrains.kotlin.fir.expressions.arguments import org.jetbrains.kotlin.fir.resolve.transformers.plugin.CompilerRequiredAnnotationsHelper import org.jetbrains.kotlin.fir.symbols.* import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name internal fun mapAnnotationParameters(annotation: FirAnnotation): Map { + if (annotation is FirAnnotationCall && annotation.arguments.isEmpty()) return emptyMap() + checkWithAttachmentBuilder(annotation.resolved, { "By now the annotations argument mapping should have been resolved" }) { withFirEntry("annotation", annotation) withClassEntry("annotationTypeRef", annotation.annotationTypeRef)