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

[FIR] Don't cache importing scopes while resolving plugin's annotations

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-06-03 11:59:30 +03:00
parent 1ffe438fa1
commit 1f80f35ce6
2 changed files with 10 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/transformers/plugin/FirAbstractAnnotationResolveTransformer.kt
+1 -1
View File
@@ -30,7 +30,7 @@ internal abstract class FirAbstractAnnotationResolveTransformer<D, S>(
override fun transformFile(file: FirFile, data: D): CompositeTransformResult<FirDeclaration> { override fun transformFile(file: FirFile, data: D): CompositeTransformResult<FirDeclaration> {
return withScopeCleanup(towerScope.scopes) { return withScopeCleanup(towerScope.scopes) {
towerScope.addScopes(createImportingScopes(file, session, scopeSession)) towerScope.addScopes(createImportingScopes(file, session, scopeSession, useCaching = false))
val state = beforeChildren(file) val state = beforeChildren(file)
file.transformDeclarations(this, data) file.transformDeclarations(this, data)
afterChildren(state) afterChildren(state)
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt
+9 -4
View File
@@ -22,10 +22,15 @@ private class ListStorageFirScope(val result: List<FirScope>) : FirScope()
fun createImportingScopes( fun createImportingScopes(
file: FirFile, file: FirFile,
session: FirSession, session: FirSession,
scopeSession: ScopeSession scopeSession: ScopeSession,
): List<FirScope> = scopeSession.getOrBuild(file, FileImportingScopeKey) { useCaching: Boolean = true
ListStorageFirScope(doCreateImportingScopes(file, session, scopeSession)) ): List<FirScope> = if (useCaching) {
}.result scopeSession.getOrBuild(file, FileImportingScopeKey) {
ListStorageFirScope(doCreateImportingScopes(file, session, scopeSession))
}.result
} else {
doCreateImportingScopes(file, session, scopeSession)
}
private fun doCreateImportingScopes( private fun doCreateImportingScopes(
file: FirFile, file: FirFile,