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

FIR body resolve: use one scope session per module

Browse Source 
Gives significant (~5%) performance boost mainly due to use-site scope caching
This commit is contained in:
Mikhail Glukhikh
2019-10-08 13:25:15 +03:00
parent c2c88a9ee6
commit 07e067102b
3 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/fir/AbstractFirMultiModuleResolveTest.kt
+21 -6
View File
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fir.FirRenderer
import org.jetbrains.kotlin.fir.builder.RawFirBuilder
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
import org.jetbrains.kotlin.fir.declarations.FirFile
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.declarations.classId
import org.jetbrains.kotlin.fir.dependenciesWithoutSelf
import org.jetbrains.kotlin.fir.java.FirJavaModuleBasedSession
@@ -23,9 +24,9 @@ import org.jetbrains.kotlin.fir.java.JavaSymbolProvider
import org.jetbrains.kotlin.fir.java.declarations.FirJavaClass
import org.jetbrains.kotlin.fir.java.declarations.FirJavaMethod
import org.jetbrains.kotlin.fir.java.scopes.JavaClassEnhancementScope
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.firProvider
import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.impl.FirCompositeSymbolProvider
import org.jetbrains.kotlin.fir.resolve.impl.FirProviderImpl
import org.jetbrains.kotlin.fir.resolve.transformers.FirTotalResolveTransformer
@@ -76,7 +77,8 @@ abstract class AbstractFirMultiModuleResolveTest : AbstractMultiModuleTest() {
}
private fun doFirResolveTest(dirPath: String) {
val firFiles = mutableListOf<FirFile>()
val firFilesPerSession = mutableMapOf<FirJavaModuleBasedSession, List<FirFile>>()
val totalTransformerPerSession = mutableMapOf<FirJavaModuleBasedSession, FirTotalResolveTransformer>()
val sessions = mutableListOf<FirJavaModuleBasedSession>()
val provider = FirProjectSessionProvider(project)
for (module in project.allModules().drop(1)) {
@@ -99,14 +101,17 @@ abstract class AbstractFirMultiModuleResolveTest : AbstractMultiModuleTest() {
val files = FileTypeIndex.getFiles(KotlinFileType.INSTANCE, contentScope)
println("Got vfiles: ${files.size}")
val firFiles = mutableListOf<FirFile>()
files.forEach {
val file = psiManager.findFile(it) as? KtFile ?: return@forEach
val firFile = builder.buildFirFile(file)
(session.firProvider as FirProviderImpl).recordFile(firFile)
firFiles += firFile
}
firFilesPerSession[session] = firFiles
totalTransformerPerSession[session] = FirTotalResolveTransformer()
}
println("Raw fir up, files: ${firFiles.size}")
println("Raw fir up, files: ${firFilesPerSession.values.flatten().size}")
fun expectedTxtPath(virtualFile: VirtualFile): String {
val virtualPath = virtualFile.path
@@ -120,13 +125,23 @@ abstract class AbstractFirMultiModuleResolveTest : AbstractMultiModuleTest() {
return result!!
}
val transformer = FirTotalResolveTransformer()
transformer.processFiles(firFiles)
for (file in firFiles) {
// Start from 1 to miss raw FIR building
for (phaseIndex in 1 until FirResolvePhase.values().size) {
for (session in sessions) {
val firFiles = firFilesPerSession[session]!!
val transformer = totalTransformerPerSession[session]!!
for (file in firFiles) {
transformer.transformers[phaseIndex - 1].visitFile(file, null)
}
}
}
for (file in firFilesPerSession.values.flatten()) {
val firFileDump = StringBuilder().also { file.accept(FirRenderer(it), null) }.toString()
val expectedPath = expectedTxtPath((file.psi as PsiFile).virtualFile)
KotlinTestUtils.assertEqualsToFile(File(expectedPath), firFileDump)
}
val processedJavaClasses = mutableSetOf<FirJavaClass>()
val javaFirDump = StringBuilder().also { builder ->
val renderer = FirRenderer(builder)