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

FIR IDE: add cache in KtFirCallResolver

Browse Source
This commit is contained in:
Tianyu Geng
2021-08-27 11:21:08 -07:00
committed by Ilya Kirillov
parent d2ed203528
commit c19ed07fd1
1 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt
+12 -2
View File
@@ -48,12 +48,14 @@ import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.findAssignment import org.jetbrains.kotlin.psi.psiUtil.findAssignment
import org.jetbrains.kotlin.util.OperatorNameConventions import org.jetbrains.kotlin.util.OperatorNameConventions
import org.jetbrains.kotlin.utils.addToStdlib.safeAs import org.jetbrains.kotlin.utils.addToStdlib.safeAs
import java.util.concurrent.ConcurrentHashMap
internal class KtFirCallResolver( internal class KtFirCallResolver(
override val analysisSession: KtFirAnalysisSession, override val analysisSession: KtFirAnalysisSession,
override val token: ValidityToken, override val token: ValidityToken,
) : KtCallResolver(), KtFirAnalysisSessionComponent { ) : KtCallResolver(), KtFirAnalysisSessionComponent {
private val diagnosticCache = mutableListOf<FirDiagnostic>() private val diagnosticCache = mutableListOf<FirDiagnostic>()
private val cache: ConcurrentHashMap<KtElement, KtCall?> = ConcurrentHashMap()
override fun resolveAccessorCall(call: KtSimpleNameExpression): KtCall? = withValidityAssertion { override fun resolveAccessorCall(call: KtSimpleNameExpression): KtCall? = withValidityAssertion {
when (val fir = call.getOrBuildFir(firResolveState)) { when (val fir = call.getOrBuildFir(firResolveState)) {
@@ -88,6 +90,7 @@ internal class KtFirCallResolver(
} }
override fun resolveCall(call: KtBinaryExpression): KtCall? = withValidityAssertion { override fun resolveCall(call: KtBinaryExpression): KtCall? = withValidityAssertion {
cache.computeIfAbsent(call) {
when (val fir = call.getOrBuildFir(firResolveState)) { when (val fir = call.getOrBuildFir(firResolveState)) {
is FirFunctionCall -> resolveCall(fir) is FirFunctionCall -> resolveCall(fir)
is FirComparisonExpression -> resolveCall(fir.compareToCall) is FirComparisonExpression -> resolveCall(fir.compareToCall)
@@ -95,8 +98,10 @@ internal class KtFirCallResolver(
else -> null else -> null
} }
} }
}
override fun resolveCall(call: KtUnaryExpression): KtCall? = withValidityAssertion { override fun resolveCall(call: KtUnaryExpression): KtCall? = withValidityAssertion {
cache.computeIfAbsent(call) {
when (val fir = call.getOrBuildFir(firResolveState)) { when (val fir = call.getOrBuildFir(firResolveState)) {
is FirFunctionCall -> resolveCall(fir) is FirFunctionCall -> resolveCall(fir)
is FirBlock -> { is FirBlock -> {
@@ -109,9 +114,11 @@ internal class KtFirCallResolver(
else -> null else -> null
} }
} }
}
override fun resolveCall(call: KtCallElement): KtCall? = withValidityAssertion { override fun resolveCall(call: KtCallElement): KtCall? = withValidityAssertion {
return when (val fir = call.getOrBuildFir(firResolveState)) { cache.computeIfAbsent(call) {
when (val fir = call.getOrBuildFir(firResolveState)) {
is FirArrayOfCall -> resolveArrayOfCall(fir) is FirArrayOfCall -> resolveArrayOfCall(fir)
is FirFunctionCall -> resolveCall(fir) is FirFunctionCall -> resolveCall(fir)
is FirAnnotationCall -> fir.asAnnotationCall() is FirAnnotationCall -> fir.asAnnotationCall()
@@ -121,13 +128,16 @@ internal class KtFirCallResolver(
else -> null else -> null
} }
} }
}
override fun resolveCall(call: KtArrayAccessExpression): KtCall? = withValidityAssertion { override fun resolveCall(call: KtArrayAccessExpression): KtCall? = withValidityAssertion {
return when (val fir = call.getOrBuildFir(firResolveState)) { cache.computeIfAbsent(call) {
when (val fir = call.getOrBuildFir(firResolveState)) {
is FirFunctionCall -> resolveCall(fir) is FirFunctionCall -> resolveCall(fir)
else -> null else -> null
} }
} }
}
private fun resolveArrayOfCall(arrayOfCall: FirArrayOfCall): KtCall? { private fun resolveArrayOfCall(arrayOfCall: FirArrayOfCall): KtCall? {
val arrayOfSymbol = with(analysisSession) { val arrayOfSymbol = with(analysisSession) {