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

FIR: Cache supetypes scopes when building callable scopes for qualifier

Browse Source
This commit is contained in:
Denis Zharkov
2020-05-12 12:34:30 +03:00
parent 774c5b55c3
commit 27aa0040be
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/QualifierReceiver.kt
+11 -3
View File
@@ -10,17 +10,20 @@ import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.expressions.FirExpression
import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.ScopeSessionKey
import org.jetbrains.kotlin.fir.resolve.lookupSuperTypes
import org.jetbrains.kotlin.fir.resolve.toSymbol
import org.jetbrains.kotlin.fir.scopes.FirScope
import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider
import org.jetbrains.kotlin.fir.scopes.impl.*
import org.jetbrains.kotlin.fir.scopes.impl.FirCompositeScope
import org.jetbrains.kotlin.fir.scopes.impl.FirOnlyCallablesScope
import org.jetbrains.kotlin.fir.scopes.impl.FirOnlyClassifiersScope
import org.jetbrains.kotlin.fir.scopes.impl.FirPackageMemberScope
import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
import org.jetbrains.kotlin.fir.types.ConeClassErrorType
import org.jetbrains.kotlin.fir.types.ConeClassLikeType
import java.util.ArrayDeque
import java.util.*
fun FirClassLikeDeclaration<*>.fullyExpandedClass(useSiteSession: FirSession): FirRegularClass? {
@@ -61,6 +64,9 @@ class ClassQualifierReceiver(
val scopeSession: ScopeSession
) : QualifierReceiver(explicitReceiver) {
private companion object {
val SUPERTYPE_STATICS_SCOPE_SESSION_KEY = object : ScopeSessionKey<FirClass<*>, List<FirScope>>() {}
}
private fun collectSuperTypeScopesComposedByDepth(
klass: FirClass<*>,
@@ -114,7 +120,9 @@ class ClassQualifierReceiver(
if (klassScope != null) {
result += klassScope
if (provider is KotlinScopeProvider) return result
result += collectSuperTypeScopesComposedByDepth(klass, useSiteSession, scopeSession)
result += scopeSession.getOrBuild(klass, SUPERTYPE_STATICS_SCOPE_SESSION_KEY) {
collectSuperTypeScopesComposedByDepth(klass, useSiteSession, scopeSession)
}
}
return result
}