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

FIR nested classifier scope building: optimize companion search

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-11-07 18:20:42 +03:00
parent 48938a20a7
commit 411dc5d60e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirAbstractTreeTransformerWithSuperTypes.kt
+2 -2
View File
@@ -41,8 +41,8 @@ abstract class FirAbstractTreeTransformerWithSuperTypes(
nestedClassifierScope(it.lookupTag.classId, session) nestedClassifierScope(it.lookupTag.classId, session)
} }
regularClass.addTypeParametersScope() regularClass.addTypeParametersScope()
val companionObjects = regularClass.declarations.filterIsInstance<FirRegularClass>().filter { it.isCompanion } val companionObject = regularClass.companionObject
for (companionObject in companionObjects) { if (companionObject != null) {
towerScope.scopes += nestedClassifierScope(companionObject) towerScope.scopes += nestedClassifierScope(companionObject)
} }
towerScope.scopes += nestedClassifierScope(regularClass) towerScope.scopes += nestedClassifierScope(regularClass)
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
+2 -2
View File
@@ -231,8 +231,8 @@ class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransformer)
if (regularClass.symbol.classId.isLocal) { if (regularClass.symbol.classId.isLocal) {
prepareLocalClassForBodyResolve(regularClass) prepareLocalClassForBodyResolve(regularClass)
} }
val companionObjects = regularClass.declarations.filterIsInstance<FirRegularClass>().filter { it.isCompanion } val companionObject = regularClass.companionObject
for (companionObject in companionObjects) { if (companionObject != null) {
topLevelScopes += nestedClassifierScope(companionObject) topLevelScopes += nestedClassifierScope(companionObject)
} }
topLevelScopes += nestedClassifierScope(regularClass) topLevelScopes += nestedClassifierScope(regularClass)