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

FIR: Do not retrieve file for callable until it's needed

Browse Source
This commit is contained in:
Denis Zharkov
2020-05-12 17:41:59 +03:00
parent 295f7d7500
commit 25bee057e0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolverParts.kt
+5 -5
View File
@@ -434,11 +434,6 @@ internal object CheckVisibility : CheckerStage() {
val containingDeclarations = callInfo.containingDeclarations val containingDeclarations = callInfo.containingDeclarations
val session = callInfo.session val session = callInfo.session
val provider = session.firProvider val provider = session.firProvider
val candidateFile = when (symbol) {
is FirClassLikeSymbol<*> -> provider.getFirClassifierContainerFileIfAny(symbol)
is FirCallableSymbol<*> -> provider.getFirCallableContainerFile(symbol)
else -> null
}
val ownerId = symbol.getOwnerId() val ownerId = symbol.getOwnerId()
val visible = when (declaration.visibility) { val visible = when (declaration.visibility) {
JavaVisibilities.PACKAGE_VISIBILITY -> { JavaVisibilities.PACKAGE_VISIBILITY -> {
@@ -450,6 +445,11 @@ internal object CheckVisibility : CheckerStage() {
Visibilities.PRIVATE, Visibilities.PRIVATE_TO_THIS -> { Visibilities.PRIVATE, Visibilities.PRIVATE_TO_THIS -> {
if (declaration.session == callInfo.session) { if (declaration.session == callInfo.session) {
if (ownerId == null || declaration is FirConstructor && declaration.isFromSealedClass) { if (ownerId == null || declaration is FirConstructor && declaration.isFromSealedClass) {
val candidateFile = when (symbol) {
is FirClassLikeSymbol<*> -> provider.getFirClassifierContainerFileIfAny(symbol)
is FirCallableSymbol<*> -> provider.getFirCallableContainerFile(symbol)
else -> null
}
// Top-level: visible in file // Top-level: visible in file
candidateFile == useSiteFile candidateFile == useSiteFile
} else { } else {