azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR][Serialization] Use resolvedCompilerAnnotationsWithClassIds to avoid recursive resolve

Browse Source 
`resolvedAnnotationsWithClassIds` requires resolve to TYPES phase,
which is unavailable during compiler plugins stages. Trying to resolve
to that phases will cause an infinite recursive resolve loop

Also, call `resolvedAnnotationsWithArguments` only when
`neededArguments` is true

^KTIJ-24893 Fixed
This commit is contained in:
Roman Golyshev
2023-03-13 15:51:22 +01:00
committed by teamcity
parent 5505fd207e
commit ff7c095fb3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlinx-serialization/kotlinx-serialization.k2/src/org/jetbrains/kotlinx/serialization/compiler/fir/SerializationFirUtils.kt
+5 -1
View File
@@ -84,7 +84,11 @@ val FirClassSymbol<*>.hasSerializableAnnotation: Boolean
get() = serializableAnnotation(needArguments = false, this@FirSession) != null get() = serializableAnnotation(needArguments = false, this@FirSession) != null
fun FirBasedSymbol<*>.serializableAnnotation(needArguments: Boolean, session: FirSession): FirAnnotation? { fun FirBasedSymbol<*>.serializableAnnotation(needArguments: Boolean, session: FirSession): FirAnnotation? {
val annotations = if (needArguments) resolvedAnnotationsWithClassIds else resolvedAnnotationsWithArguments val annotations = if (needArguments) {
resolvedAnnotationsWithArguments
} else {
resolvedCompilerAnnotationsWithClassIds
}
return annotations.serializableAnnotation(session) return annotations.serializableAnnotation(session)
} }