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

Fix performance regression in KotlinSuppressCache.isSuppressedByAnnotated

Browse Source 
After a seemingly innocent refactoring in 61548a0a36, we've lost the
optimization that was enabled by the suppressorAbove logic in
isSuppressedByAnnotated.
This commit is contained in:
Alexander Udalov
2020-11-20 19:33:52 +01:00
parent efee3ea648
commit ed481add08
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/KotlinSuppressCache.kt
+9 -9
View File
@@ -115,7 +115,7 @@ abstract class KotlinSuppressCache {
val suppressor = getOrCreateSuppressor(annotated) val suppressor = getOrCreateSuppressor(annotated)
if (suppressor.isSuppressed(suppressionKey, severity)) return true if (suppressor.isSuppressed(suppressionKey, severity)) return true
val annotatedAbove = KtStubbedPsiUtil.getPsiOrStubParent(annotated, KtAnnotated::class.java, true) ?: return false val annotatedAbove = KtStubbedPsiUtil.getPsiOrStubParent(suppressor.annotatedElement, KtAnnotated::class.java, true) ?: return false
val suppressed = isSuppressedByAnnotated(suppressionKey, severity, annotatedAbove, debugDepth + 1) val suppressed = isSuppressedByAnnotated(suppressionKey, severity, annotatedAbove, debugDepth + 1)
val suppressorAbove = suppressors[annotatedAbove] val suppressorAbove = suppressors[annotatedAbove]
@@ -130,9 +130,9 @@ abstract class KotlinSuppressCache {
suppressors.getOrPut(annotated) { suppressors.getOrPut(annotated) {
val strings = getSuppressingStrings(annotated) val strings = getSuppressingStrings(annotated)
when (strings.size) { when (strings.size) {
0 -> EmptySuppressor 0 -> EmptySuppressor(annotated)
1 -> SingularSuppressor(strings.first()) 1 -> SingularSuppressor(annotated, strings.first())
else -> MultiSuppressor(strings) else -> MultiSuppressor(annotated, strings)
} }
} }
@@ -170,7 +170,7 @@ abstract class KotlinSuppressCache {
severity == Severity.WARNING && "warnings" in strings || key in strings severity == Severity.WARNING && "warnings" in strings || key in strings
} }
private abstract class Suppressor { private abstract class Suppressor(val annotatedElement: KtAnnotated) {
open fun isSuppressed(diagnostic: Diagnostic): Boolean = open fun isSuppressed(diagnostic: Diagnostic): Boolean =
isSuppressed(getDiagnosticSuppressKey(diagnostic), diagnostic.severity) isSuppressed(getDiagnosticSuppressKey(diagnostic), diagnostic.severity)
@@ -180,13 +180,13 @@ abstract class KotlinSuppressCache {
abstract fun dominates(other: Suppressor): Boolean abstract fun dominates(other: Suppressor): Boolean
} }
private object EmptySuppressor : Suppressor() { private class EmptySuppressor(annotated: KtAnnotated) : Suppressor(annotated) {
override fun isSuppressed(diagnostic: Diagnostic): Boolean = false override fun isSuppressed(diagnostic: Diagnostic): Boolean = false
override fun isSuppressed(suppressionKey: String, severity: Severity): Boolean = false override fun isSuppressed(suppressionKey: String, severity: Severity): Boolean = false
override fun dominates(other: Suppressor): Boolean = this === other override fun dominates(other: Suppressor): Boolean = other is EmptySuppressor
} }
private class SingularSuppressor(private val string: String) : Suppressor() { private class SingularSuppressor(annotated: KtAnnotated, private val string: String) : Suppressor(annotated) {
override fun isSuppressed(suppressionKey: String, severity: Severity): Boolean { override fun isSuppressed(suppressionKey: String, severity: Severity): Boolean {
return isSuppressedByStrings(suppressionKey, ImmutableSet.of(string), severity) return isSuppressedByStrings(suppressionKey, ImmutableSet.of(string), severity)
} }
@@ -196,7 +196,7 @@ abstract class KotlinSuppressCache {
} }
} }
private class MultiSuppressor(private val strings: Set<String>) : Suppressor() { private class MultiSuppressor(annotated: KtAnnotated, private val strings: Set<String>) : Suppressor(annotated) {
override fun isSuppressed(suppressionKey: String, severity: Severity): Boolean { override fun isSuppressed(suppressionKey: String, severity: Severity): Boolean {
return isSuppressedByStrings(suppressionKey, strings, severity) return isSuppressedByStrings(suppressionKey, strings, severity)
} }