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

Do not run annotation checkers for every non-annotated element

Browse Source
This commit is contained in:
Alexander Udalov
2017-12-20 18:33:47 +01:00
parent 46b8deedf7
commit 19e38bbc72
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt
+6 -2
View File
@@ -44,7 +44,6 @@ class AnnotationChecker(
private val additionalCheckers: Iterable<AdditionalAnnotationChecker>, private val additionalCheckers: Iterable<AdditionalAnnotationChecker>,
private val languageVersionSettings: LanguageVersionSettings private val languageVersionSettings: LanguageVersionSettings
) { ) {
fun check(annotated: KtAnnotated, trace: BindingTrace, descriptor: DeclarationDescriptor? = null) { fun check(annotated: KtAnnotated, trace: BindingTrace, descriptor: DeclarationDescriptor? = null) {
val actualTargets = getActualTargetList(annotated, descriptor, trace) val actualTargets = getActualTargetList(annotated, descriptor, trace)
checkEntries(annotated.annotationEntries, actualTargets, trace, annotated) checkEntries(annotated.annotationEntries, actualTargets, trace, annotated)
@@ -106,6 +105,8 @@ class AnnotationChecker(
trace: BindingTrace, trace: BindingTrace,
annotated: KtAnnotated? = null annotated: KtAnnotated? = null
) { ) {
if (entries.isEmpty()) return
val entryTypesWithAnnotations = hashMapOf<KotlinType, MutableList<AnnotationUseSiteTarget?>>() val entryTypesWithAnnotations = hashMapOf<KotlinType, MutableList<AnnotationUseSiteTarget?>>()
for (entry in entries) { for (entry in entries) {
@@ -124,7 +125,10 @@ class AnnotationChecker(
existingTargetsForAnnotation.add(useSiteTarget) existingTargetsForAnnotation.add(useSiteTarget)
} }
additionalCheckers.forEach { it.checkEntries(entries, actualTargets.defaultTargets, trace) }
for (checker in additionalCheckers) {
checker.checkEntries(entries, actualTargets.defaultTargets, trace)
}
} }
private fun checkAnnotationEntry(entry: KtAnnotationEntry, actualTargets: TargetList, trace: BindingTrace) { private fun checkAnnotationEntry(entry: KtAnnotationEntry, actualTargets: TargetList, trace: BindingTrace) {