From 16caeafa981be382f805e63a36605efb6d737d16 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Wed, 18 Jan 2023 20:33:14 +0100 Subject: [PATCH] [FIR] temporarily remove Retention and Target annotations from COMPILER_REQUIRED_ANNOTATIONS phase currently AbstractFirSpecificAnnotationResolveTransformer doesn't work well for annotations with arguments ^KT-56046 --- .../AbstractFirSpecificAnnotationResolveTransformer.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/AbstractFirSpecificAnnotationResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/AbstractFirSpecificAnnotationResolveTransformer.kt index 0b366ab46e4..790c39a8818 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/AbstractFirSpecificAnnotationResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/AbstractFirSpecificAnnotationResolveTransformer.kt @@ -38,7 +38,6 @@ import org.jetbrains.kotlin.fir.visitors.FirDefaultTransformer import org.jetbrains.kotlin.fir.visitors.transformSingle import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.name.StandardClassIds.Annotations import org.jetbrains.kotlin.name.StandardClassIds.Annotations.Deprecated import org.jetbrains.kotlin.name.StandardClassIds.Annotations.DeprecatedSinceKotlin import org.jetbrains.kotlin.name.StandardClassIds.Annotations.JvmRecord @@ -48,16 +47,16 @@ import org.jetbrains.kotlin.utils.addToStdlib.shouldNotBeCalled object CompilerRequiredAnnotationsHelper { internal val REQUIRED_ANNOTATIONS_WITH_ARGUMENTS: Set = setOf( Deprecated, - Annotations.Retention, - Annotations.Target, +// Annotations.Retention, +// Annotations.Target, ) val REQUIRED_ANNOTATIONS: Set = REQUIRED_ANNOTATIONS_WITH_ARGUMENTS + setOf( DeprecatedSinceKotlin, WasExperimental, JvmRecord, - Annotations.Repeatable, - Annotations.Java.Repeatable, +// Annotations.Repeatable, +// Annotations.Java.Repeatable, ) }