FIR deserializer: remove cycle in annotations loading

compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt

@@ -280,7 +280,10 @@ class KotlinDeserializedJvmSymbolsProvider(
         parentContext: FirDeserializationContext? = null
     ): FirClassSymbol? {
         if (!hasTopLevelClassOf(classId)) return null
-        return classesCache.getOrPut(classId) {
+        if (classesCache.containsKey(classId)) return classesCache[classId]
+
+
+//        return classesCache.getOrPut(classId) {
         //return null
         val kotlinJvmBinaryClass = kotlinClassFinder.findKotlinClass(classId)
         if (kotlinJvmBinaryClass == null) {
@@ -294,7 +297,7 @@ class KotlinDeserializedJvmSymbolsProvider(
 
             val symbol = FirClassSymbol(classId)
             FirEnumEntryImpl(session, null, symbol, classId.shortClassName)
-                symbol
+            classesCache[classId] = symbol
         } else {
             if (kotlinJvmBinaryClass.classHeader.kind != KotlinClassHeader.Kind.CLASS) return null
             val (nameResolver, classProto) = kotlinJvmBinaryClass.readClassDataFrom() ?: return null
@@ -308,6 +311,7 @@ class KotlinDeserializedJvmSymbolsProvider(
                 ),
                 this::findAndDeserializeClass
             )
+            classesCache[classId] = symbol
             val annotations = mutableListOf<FirAnnotationCall>()
             kotlinJvmBinaryClass.loadClassAnnotations(object : KotlinJvmBinaryClass.AnnotationVisitor {
                 override fun visitAnnotation(classId: ClassId, source: SourceElement): KotlinJvmBinaryClass.AnnotationArgumentVisitor? {
@@ -317,11 +321,13 @@ class KotlinDeserializedJvmSymbolsProvider(
                 override fun visitEnd() {
                 }
 
+
             }, null)
             (symbol.fir as FirAbstractAnnotatedElement).annotations += annotations
-                symbol
-            }
         }
+
+        return classesCache[classId]
+//        }
     }
 
     private fun loadFunctionsByName(part: PackagePartsCacheData, name: Name): List<FirCallableSymbol> {

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedAnnotation.txt

@@ -1,4 +1,4 @@
-public final annotation class AnnotatedAnnotation : R|kotlin/Annotation| {
+@R|test/AnnotatedAnnotation|() public final annotation class AnnotatedAnnotation : R|kotlin/Annotation| {
     public constructor(): R|test/AnnotatedAnnotation|
 
 }