diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirResolveProcessor.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirResolveProcessor.kt index 8778c428a0c..b24c5a4e1ed 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirResolveProcessor.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirResolveProcessor.kt @@ -16,7 +16,7 @@ annotation class AdapterForResolveProcessor sealed class FirResolveProcessor(val session: FirSession, val scopeSession: ScopeSession) abstract class FirGlobalResolveProcessor(session: FirSession, scopeSession: ScopeSession) : FirResolveProcessor(session, scopeSession) { - abstract fun process() + abstract fun process(files: Collection) } abstract class FirTransformerBasedResolveProcessor( @@ -28,4 +28,4 @@ abstract class FirTransformerBasedResolveProcessor( fun processFile(file: FirFile) { file.transform(transformer, null) } -} \ No newline at end of file +} diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveProcessor.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveProcessor.kt index 17ec0cd3524..a385324ff3b 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveProcessor.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveProcessor.kt @@ -24,7 +24,7 @@ class FirTotalResolveProcessor(session: FirSession) { } } is FirGlobalResolveProcessor -> { - processor.process() + processor.process(files) } } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirGlobalClassGenerationProcessor.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirGlobalClassGenerationProcessor.kt index 0d68e6e606b..0c17a548ff3 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirGlobalClassGenerationProcessor.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirGlobalClassGenerationProcessor.kt @@ -20,7 +20,7 @@ class FirGlobalClassGenerationProcessor( session: FirSession, scopeSession: ScopeSession ) : FirGlobalResolveProcessor(session, scopeSession) { - override fun process() { + override fun process(files: Collection) { val extensions = session.extensionService.declarationGenerators if (extensions.isEmpty()) return val provider = session.predicateBasedProvider diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirGlobalExtensionStatusProcessor.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirGlobalExtensionStatusProcessor.kt index 45fb485117e..9305d649427 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirGlobalExtensionStatusProcessor.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirGlobalExtensionStatusProcessor.kt @@ -24,7 +24,7 @@ class FirGlobalExtensionStatusProcessor( session: FirSession, scopeSession: ScopeSession ) : FirGlobalResolveProcessor(session, scopeSession) { - override fun process() { + override fun process(files: Collection) { val extensions = session.extensionService.statusTransformerExtensions if (extensions.isEmpty()) return val provider = session.predicateBasedProvider diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirGlobalNewMemberGenerationProcessor.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirGlobalNewMemberGenerationProcessor.kt index 964d51b927e..24614ebd0b1 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirGlobalNewMemberGenerationProcessor.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirGlobalNewMemberGenerationProcessor.kt @@ -26,7 +26,7 @@ class FirGlobalNewMemberGenerationProcessor( private val index = session.generatedClassIndex private val provider = session.predicateBasedProvider - override fun process() { + override fun process(files: Collection) { val extensions = session.extensionService.declarationGenerators if (extensions.isEmpty()) return for (extension in extensions) { @@ -64,4 +64,4 @@ class FirGlobalNewMemberGenerationProcessor( } } } -} \ No newline at end of file +} diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt index 790eb388187..8aa8f282457 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt @@ -159,7 +159,7 @@ class FirResolveBench(val withProgress: Boolean) { private fun runStage(processor: FirResolveProcessor, firFileSequence: Sequence) { when (processor) { is FirTransformerBasedResolveProcessor -> runStage(processor, firFileSequence) - is FirGlobalResolveProcessor -> runStage(processor) + is FirGlobalResolveProcessor -> runStage(processor, firFileSequence.toList()) } } @@ -182,10 +182,10 @@ class FirResolveBench(val withProgress: Boolean) { } } - private fun runStage(processor: FirGlobalResolveProcessor) { + private fun runStage(processor: FirGlobalResolveProcessor, firFiles: List) { processWithTimeMeasure( processor::class, - { processor.process() } + { processor.process(firFiles) } ) { e -> val message = "Fail on stage ${processor::class}" println(message)