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

Fix invalid repeatable annotations loading in sutb builder

Browse Source
This commit is contained in:
Ilya Kirillov
2021-12-21 14:15:00 +03:00
parent d2832697d9
commit 0efc819e48
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/KotlinClsStubBuilder.kt
+12 -4
View File
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.SpecialJvmAnnotations
import org.jetbrains.kotlin.analysis.decompiler.stub.*
import org.jetbrains.kotlin.descriptors.SourceElement
import org.jetbrains.kotlin.deserialization.common.jvm.impl.VirtualFileKotlinClass
import org.jetbrains.kotlin.load.java.JvmAnnotationNames
import org.jetbrains.kotlin.load.kotlin.*
import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
import org.jetbrains.kotlin.metadata.ProtoBuf
@@ -158,10 +159,9 @@ private class AnnotationLoaderForClassFileStubBuilder(
}
override fun visitEnd() {
// todo
// if (!isRepeatableWithImplicitContainer(annotationClassId, arguments)) {
// result.add(annotationClassId)
// }
if (!isRepeatableWithImplicitContainer(annotationClassId, arguments)) {
result.add(annotationClassId)
}
}
override fun visit(name: Name?, value: Any?) = Unit
@@ -171,6 +171,14 @@ private class AnnotationLoaderForClassFileStubBuilder(
}
}
protected fun isRepeatableWithImplicitContainer(annotationClassId: ClassId, arguments: Map<Name, ConstantValue<*>>): Boolean {
if (annotationClassId != SpecialJvmAnnotations.JAVA_LANG_ANNOTATION_REPEATABLE) return false
val containerKClassValue = arguments[JvmAnnotationNames.DEFAULT_ANNOTATION_MEMBER_NAME] as? KClassValue ?: return false
val normalClass = containerKClassValue.value as? KClassValue.Value.NormalClass ?: return false
return isImplicitRepeatableContainer(normalClass.classId)
}
private fun loadAnnotationsAndInitializers(kotlinClass: KotlinJvmBinaryClass): AnnotationsClassIdContainer {
val memberAnnotations = HashMap<MemberSignature, MutableList<ClassId>>()