jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FIR] Add FirSession as parameter for FirTotalResolveTransformer

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-05-19 11:03:22 +03:00
parent c165b8d55c
commit 24c8a659ee
12 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarks/src/org/jetbrains/kotlin/benchmarks/AbstractSimpleFileBenchmark.kt
View File

@@ -164,7 +164,7 @@ abstract class AbstractSimpleFileBenchmark {
val firProvider = session.firProvider as FirProviderImpl
val builder = RawFirBuilder(session, firProvider.kotlinScopeProvider, stubMode = false)
val totalTransformer = FirTotalResolveTransformer()
val totalTransformer = FirTotalResolveTransformer(session)
val firFile = builder.buildFirFile(file).also(firProvider::recordFile)
for (transformer in totalTransformer.transformers) {

2
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
View File

@@ -331,7 +331,7 @@ object KotlinToJVMBytecodeCompiler {
}
val firProvider = (session.firProvider as FirProviderImpl)
val builder = RawFirBuilder(session, firProvider.kotlinScopeProvider, stubMode = false)
val resolveTransformer = FirTotalResolveTransformer()
val resolveTransformer = FirTotalResolveTransformer(session)
val firFiles = ktFiles.map {
val firFile = builder.buildFirFile(it)
firProvider.recordFile(firFile)

2
compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/AbstractFir2IrTextTest.kt
View File

@@ -68,7 +68,7 @@ abstract class AbstractFir2IrTextTest : AbstractIrTextTestCase() {
val firProvider = (session.firProvider as FirProviderImpl)
val builder = RawFirBuilder(session, firProvider.kotlinScopeProvider, stubMode = false)
val resolveTransformer = FirTotalResolveTransformer()
val resolveTransformer = FirTotalResolveTransformer(session)
val firFiles = psiFiles.map {
val firFile = builder.buildFirFile(it)
firProvider.recordFile(firFile)

2
compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
View File

@@ -55,7 +55,7 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() {
.uniteWith(TopDownAnalyzerFacadeForJVM.AllJavaSourcesInProjectScope(project))
val librariesScope = ProjectScope.getLibrariesScope(project)
val session = createSession(environment, scope, librariesScope, moduleData.qualifiedName)
val totalTransformer = FirTotalResolveTransformer()
val totalTransformer = FirTotalResolveTransformer(session)
val firProvider = session.firProvider as FirProviderImpl
val firFiles = if (useLightTree) {

2
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirAbstractPhaseTransformer.kt
View File

@@ -52,7 +52,7 @@ fun FirFile.runResolve(toPhase: FirResolvePhase, fromPhase: FirResolvePhase = Fi
var currentPhase = fromPhase
while (currentPhase < toPhase) {
currentPhase = currentPhase.next
val phaseTransformer = currentPhase.createTransformerByPhase(scopeSession)
val phaseTransformer = currentPhase.createTransformerByPhase(session, scopeSession)
transform<FirFile, Nothing?>(phaseTransformer, null)
}
}

7
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveTransformer.kt
View File

@@ -5,20 +5,19 @@
package org.jetbrains.kotlin.fir.resolve.transformers
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.FirFile
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.visitors.FirTransformer
// TODO: rework, see rr/FIR/semoro-dev FirStagesTransformerFactory
class FirTotalResolveTransformer {
class FirTotalResolveTransformer(session: FirSession) {
val scopeSession = ScopeSession()
val transformers: List<FirTransformer<Nothing?>> =
FirResolvePhase.values()
.drop(1) // to remove RAW_FIR phase
.map { it.createTransformerByPhase(scopeSession) }
.map { it.createTransformerByPhase(session, scopeSession) }
fun processFiles(files: List<FirFile>) {
for (transformer in transformers) {

3
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/ResolvePhaseUtils.kt
View File

@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.fir.resolve.transformers
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase.*
import org.jetbrains.kotlin.fir.resolve.ScopeSession
@@ -17,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.FirTransformer
// TODO: add FirSession parameter
@OptIn(AdapterForResolvePhase::class)
fun FirResolvePhase.createTransformerByPhase(scopeSession: ScopeSession): FirTransformer<Nothing?> {
fun FirResolvePhase.createTransformerByPhase(session: FirSession, scopeSession: ScopeSession): FirTransformer<Nothing?> {
return when (this) {
RAW_FIR -> throw AssertionError("Raw FIR building phase does not have a transformer")
ANNOTATIONS_FOR_PLUGINS -> FirPluginAnnotationsResolveTransformer(scopeSession)

2
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt
View File

@@ -128,7 +128,7 @@ object GenerationUtils {
val firProvider = (session.firProvider as FirProviderImpl)
val builder = RawFirBuilder(session, firProvider.kotlinScopeProvider, stubMode = false)
val resolveTransformer = FirTotalResolveTransformer()
val resolveTransformer = FirTotalResolveTransformer(session)
val firFiles = files.map {
val firFile = builder.buildFirFile(it)
firProvider.recordFile(firFile)

4
compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt
View File

@@ -73,10 +73,10 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() {
}
override fun runAnalysis(testDataFile: File, testFiles: List<TestFile>, firFilesPerSession: Map<FirSession, List<FirFile>>) {
for ((_, firFiles) in firFilesPerSession) {
for ((session, firFiles) in firFilesPerSession) {
doFirResolveTestBench(
firFiles,
FirTotalResolveTransformer().transformers,
FirTotalResolveTransformer(session).transformers,
gc = false
)
}

4
compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTest.kt
View File

@@ -31,8 +31,8 @@ abstract class AbstractFirOldFrontendDiagnosticsTest : AbstractFirDiagnosticsTes
override fun runAnalysis(testDataFile: File, testFiles: List<TestFile>, firFilesPerSession: Map<FirSession, List<FirFile>>) {
val failure: FirRuntimeException? = try {
for ((_, firFiles) in firFilesPerSession) {
doFirResolveTestBench(firFiles, FirTotalResolveTransformer().transformers, gc = false)
for ((session, firFiles) in firFilesPerSession) {
doFirResolveTestBench(firFiles, FirTotalResolveTransformer(session).transformers, gc = false)
}
null
} catch (e: FirRuntimeException) {

2
compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/AbstractFirVisualizer.kt
View File

@@ -37,7 +37,7 @@ abstract class AbstractFirVisualizer : AbstractVisualizer() {
val firProvider = (session.firProvider as FirProviderImpl)
val builder = RawFirBuilder(session, firProvider.kotlinScopeProvider, stubMode = false)
val transformer = FirTotalResolveTransformer()
val transformer = FirTotalResolveTransformer(session)
val firFiles = ktFiles.map {
val firFile = builder.buildFirFile(it)
firProvider.recordFile(firFile)

2
idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/AbstractFirMultiModuleResolveTest.kt
View File

@@ -115,7 +115,7 @@ abstract class AbstractFirMultiModuleResolveTest : AbstractMultiModuleTest() {
firFiles += firFile
}
firFilesPerSession[session] = firFiles
totalTransformerPerSession[session] = FirTotalResolveTransformer()
totalTransformerPerSession[session] = FirTotalResolveTransformer(session)
}
println("Raw fir up, files: ${firFilesPerSession.values.flatten().size}")