Pass header compilation configuration to LightTree -> Fir declaration and expression builders across all compilers.

aviroop-123 · aviroop-123 · commit c31fa025e73c · 2025-10-04T05:07:52.000Z
^KT-78422
diff --git a/compiler/arguments/resources/kotlin-compiler-arguments.json b/compiler/arguments/resources/kotlin-compiler-arguments.json
@@ -3848,7 +3848,7 @@
                         "shortName": null,
                         "deprecatedName": null,
                         "description": {
-                            "current": "Enable header compilation mode.\nIn this mode, the compiler produces class files that only contain the 'skeleton' of the classes to be\ncompiled but the method bodies of all the implementations are empty.  This is used to speed up parallel compilation\nbuild systems where header libraries can be used to replace downstream dependencies for which we only need to\nsee the type names and method signatures required to compile a given translation unit.",
+                            "current": "Enable header compilation mode.\nIn this mode, the compiler produces class files that only contain the 'skeleton' of the classes to be\ncompiled but the method bodies of all the implementations are empty.  This is used to speed up parallel compilation\nbuild systems where header libraries can be used to replace downstream dependencies for which we only need to\nsee the type names and method signatures required to compile a given translation unit. Inline functions are still kept\nwith bodies.",
                             "valueInVersions": []
                         },
                         "delimiter": null,
diff --git a/compiler/arguments/src/org/jetbrains/kotlin/arguments/description/CommonCompilerArguments.kt b/compiler/arguments/src/org/jetbrains/kotlin/arguments/description/CommonCompilerArguments.kt
@@ -1191,7 +1191,8 @@ Warning: this flag is not intended for production use. If you want to configure
                 In this mode, the compiler produces class files that only contain the 'skeleton' of the classes to be
                 compiled but the method bodies of all the implementations are empty.  This is used to speed up parallel compilation
                 build systems where header libraries can be used to replace downstream dependencies for which we only need to
-                see the type names and method signatures required to compile a given translation unit.
+                see the type names and method signatures required to compile a given translation unit. Inline functions are still kept
+                with bodies.
                 """.trimIndent().asReleaseDependent()
         valueType = BooleanType.defaultFalse
 
diff --git a/compiler/build-tools/kotlin-build-tools-api/gen/org/jetbrains/kotlin/buildtools/api/arguments/CommonCompilerArguments.kt b/compiler/build-tools/kotlin-build-tools-api/gen/org/jetbrains/kotlin/buildtools/api/arguments/CommonCompilerArguments.kt
@@ -743,7 +743,8 @@ public interface CommonCompilerArguments : CommonToolArguments {
      * In this mode, the compiler produces class files that only contain the 'skeleton' of the classes to be
      * compiled but the method bodies of all the implementations are empty.  This is used to speed up parallel compilation
      * build systems where header libraries can be used to replace downstream dependencies for which we only need to
-     * see the type names and method signatures required to compile a given translation unit.
+     * see the type names and method signatures required to compile a given translation unit. Inline functions are still kept
+     * with bodies.
      *
      * WARNING: this option is EXPERIMENTAL and it may be changed in the future without notice or may be removed entirely.
      */
diff --git a/compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt b/compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt
@@ -1051,7 +1051,8 @@ Warning: this flag is not intended for production use. If you want to configure
 In this mode, the compiler produces class files that only contain the 'skeleton' of the classes to be
 compiled but the method bodies of all the implementations are empty.  This is used to speed up parallel compilation
 build systems where header libraries can be used to replace downstream dependencies for which we only need to
-see the type names and method signatures required to compile a given translation unit.""",
+see the type names and method signatures required to compile a given translation unit. Inline functions are still kept
+with bodies.""",
     )
     var headerMode: Boolean = false
         set(value) {
diff --git a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/pipeline/web/WebFrontendPipelinePhase.kt b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/pipeline/web/WebFrontendPipelinePhase.kt
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.cli.pipeline.ConfigurationPipelineArtifact
 import org.jetbrains.kotlin.cli.pipeline.PerformanceNotifications
 import org.jetbrains.kotlin.cli.pipeline.PipelinePhase
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
+import org.jetbrains.kotlin.config.headerCompilation
 import org.jetbrains.kotlin.config.lookupTracker
 import org.jetbrains.kotlin.config.messageCollector
 import org.jetbrains.kotlin.config.perfManager
@@ -101,6 +102,7 @@ object WebFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, W
                 incrementalDataProvider = configuration.incrementalDataProvider,
                 lookupTracker = lookupTracker,
                 useWasmPlatform = isWasm,
+                configuration.headerCompilation,
             ).also {
                 kotlinPackageUsageIsFine = it.output.all { checkKotlinPackageUsageForLightTree(configuration, it.fir) }
             }
@@ -183,6 +185,7 @@ object WebFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, W
         incrementalDataProvider: IncrementalDataProvider?,
         lookupTracker: LookupTracker?,
         useWasmPlatform: Boolean,
+        headerCompilationMode: Boolean,
     ): AnalyzedFirOutput {
         val output = compileModuleToAnalyzedFir(
             moduleStructure,
@@ -194,7 +197,7 @@ object WebFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, W
             isCommonSource = { groupedSources.isCommonSourceForLt(it) },
             fileBelongsToModule = { file, it -> groupedSources.fileBelongsToModuleForLt(file, it) },
             buildResolveAndCheckFir = { session, files ->
-                buildResolveAndCheckFirViaLightTree(session, files, diagnosticsReporter, performanceManager?.let { it::addSourcesStats })
+                buildResolveAndCheckFirViaLightTree(session, files, diagnosticsReporter, headerCompilationMode, performanceManager?.let { it::addSourcesStats })
             },
             useWasmPlatform = useWasmPlatform,
         )
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/legacy/pipeline/jvmIncrementalCompilerPipelineLightTree.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/legacy/pipeline/jvmIncrementalCompilerPipelineLightTree.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.common.prepareJvmSessions
 import org.jetbrains.kotlin.cli.jvm.compiler.VfsBasedProjectEnvironment
 import org.jetbrains.kotlin.config.CompilerConfiguration
+import org.jetbrains.kotlin.config.headerCompilation
 import org.jetbrains.kotlin.config.perfManager
 import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector
 import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
@@ -96,7 +97,7 @@ private fun FrontendContext.compileModuleToAnalyzedFirViaLightTreeIncrementally(
         val countFilesAndLines = if (performanceManager == null) null else performanceManager::addSourcesStats
 
         val outputs = sessionsWithSources.map { (session, sources) ->
-            buildResolveAndCheckFirViaLightTree(session, sources, diagnosticsReporter, countFilesAndLines)
+            buildResolveAndCheckFirViaLightTree(session, sources, diagnosticsReporter, configuration.headerCompilation, countFilesAndLines)
         }
         outputs.runPlatformCheckers(diagnosticsReporter)
         FirResult(outputs)
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/pipeline/jvm/JvmFrontendPipelinePhase.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/pipeline/jvm/JvmFrontendPipelinePhase.kt
@@ -263,7 +263,7 @@ object JvmFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, J
         val countFilesAndLines = if (perfManager == null) null else perfManager::addSourcesStats
         val outputs = sessionsWithSources.map { (session, sources) ->
             val rawFirFiles = when (configuration.useLightTree) {
-                true -> session.buildFirViaLightTree(sources, diagnosticsCollector, countFilesAndLines)
+                true -> session.buildFirViaLightTree(sources, diagnosticsCollector, configuration.headerCompilation, countFilesAndLines)
                 else -> session.buildFirFromKtFiles(sources.asKtFilesList())
             }
             resolveAndCheckFir(session, rawFirFiles, diagnosticsCollector)
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/pipeline/metadata/MetadataFrontendPipelinePhase.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/pipeline/metadata/MetadataFrontendPipelinePhase.kt
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.cli.pipeline.PerformanceNotifications
 import org.jetbrains.kotlin.cli.pipeline.PipelinePhase
 import org.jetbrains.kotlin.cli.pipeline.jvm.asKtFilesList
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
+import org.jetbrains.kotlin.config.headerCompilation
 import org.jetbrains.kotlin.config.messageCollector
 import org.jetbrains.kotlin.config.moduleName
 import org.jetbrains.kotlin.config.perfManager
@@ -110,7 +111,7 @@ object MetadataFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifa
                 }
             )
             sessionsWithSources.map { (session, files) ->
-                val firFiles = session.buildFirViaLightTree(files, diagnosticsReporter) { files, lines ->
+                val firFiles = session.buildFirViaLightTree(files, diagnosticsReporter, configuration.headerCompilation) { files, lines ->
                     perfManager?.addSourcesStats(files, lines)
                 }
                 resolveAndCheckFir(session, firFiles, diagnosticsReporter)
diff --git a/compiler/fir/analysis-tests/legacy-fir-tests/testFixtures/org/jetbrains/kotlin/fir/java/AbstractFirOldFrontendLightClassesTest.kt b/compiler/fir/analysis-tests/legacy-fir-tests/testFixtures/org/jetbrains/kotlin/fir/java/AbstractFirOldFrontendLightClassesTest.kt
@@ -121,7 +121,7 @@ abstract class AbstractFirOldFrontendLightClassesTest : BaseDiagnosticsTest() {
     private fun mapKtFilesToFirFiles(session: FirSession, ktFiles: List<KtFile>, firFiles: MutableList<FirFile>, useLightTree: Boolean) {
         val firProvider = (session.firProvider as FirProviderImpl)
         if (useLightTree) {
-            val lightTreeBuilder = LightTree2Fir(session, firProvider.kotlinScopeProvider)
+            val lightTreeBuilder = LightTree2Fir(session, false, firProvider.kotlinScopeProvider)
             ktFiles.mapTo(firFiles) {
                 val firFile =
                     lightTreeBuilder.buildFirFile(
diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/pipeline/firUtils.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/pipeline/firUtils.kt
@@ -23,11 +23,12 @@ import kotlin.reflect.KFunction2
 fun FirSession.buildFirViaLightTree(
     files: Collection<KtSourceFile>,
     diagnosticsReporter: DiagnosticReporter?,
+    headerCompilationMode: Boolean,
     reportFilesAndLines: ((Int, Int) -> Unit)?,
 ): List<FirFile> {
     val firProvider = (firProvider as FirProviderImpl)
     val sourcesToPathsMapper = sourcesToPathsMapper
-    val builder = LightTree2Fir(this, firProvider.kotlinScopeProvider, diagnosticsReporter)
+    val builder = LightTree2Fir(this, headerCompilationMode, firProvider.kotlinScopeProvider, diagnosticsReporter)
     val shouldCountLines = (reportFilesAndLines != null)
     var linesCount = 0
     val firFiles = files.map { file ->
@@ -82,8 +83,9 @@ fun buildResolveAndCheckFirViaLightTree(
     session: FirSession,
     ktFiles: Collection<KtSourceFile>,
     diagnosticsReporter: BaseDiagnosticsCollector,
+    headerCompilationMode: Boolean,
     countFilesAndLines: KFunction2<Int, Int, Unit>?
 ): ModuleCompilerAnalyzedOutput {
-    val firFiles = session.buildFirViaLightTree(ktFiles, diagnosticsReporter, countFilesAndLines)
+    val firFiles = session.buildFirViaLightTree(ktFiles, diagnosticsReporter, headerCompilationMode, countFilesAndLines)
     return resolveAndCheckFir(session, firFiles, diagnosticsReporter)
 }
diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
@@ -111,7 +111,7 @@ class FirResolveModularizedTotalKotlinTest : AbstractFrontendModularizedTest() {
         val firProvider = session.firProvider as FirProviderImpl
 
         val firFiles = if (USE_LIGHT_TREE) {
-            val lightTree2Fir = LightTree2Fir(session, firProvider.kotlinScopeProvider, diagnosticsReporter = null)
+            val lightTree2Fir = LightTree2Fir(session, false, firProvider.kotlinScopeProvider, diagnosticsReporter = null)
             bench.buildFiles(lightTree2Fir, sourceFiles)
         } else {
             val builder = PsiRawFirBuilder(session, firProvider.kotlinScopeProvider)
diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/LightTree2Fir.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/LightTree2Fir.kt
@@ -23,6 +23,7 @@ import java.nio.file.Path
 
 class LightTree2Fir(
     val session: FirSession,
+    val headerCompilationMode: Boolean,
     private val scopeProvider: FirScopeProvider,
     private val diagnosticsReporter: DiagnosticReporter? = null,
 ) {
@@ -43,7 +44,7 @@ class LightTree2Fir(
         sourceFile: KtSourceFile,
         linesMapping: KtSourceFileLinesMapping,
     ): FirFile {
-        return LightTreeRawFirDeclarationBuilder(session, scopeProvider, lightTree)
+        return LightTreeRawFirDeclarationBuilder(session, scopeProvider, lightTree, headerCompilationMode=headerCompilationMode)
             .convertFile(lightTree.root, sourceFile, linesMapping)
     }
 
diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirDeclarationBuilder.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirDeclarationBuilder.kt
@@ -62,9 +62,10 @@ class LightTreeRawFirDeclarationBuilder(
     internal val baseScopeProvider: FirScopeProvider,
     tree: FlyweightCapableTreeStructure<LighterASTNode>,
     context: Context<LighterASTNode> = Context(),
+    val headerCompilationMode: Boolean,
 ) : AbstractLightTreeRawFirBuilder(session, tree, context) {
 
-    private val expressionConverter = LightTreeRawFirExpressionBuilder(session, tree, this, context)
+    private val expressionConverter = LightTreeRawFirExpressionBuilder(session, tree, this, context, headerCompilationMode)
 
     /**
      * [org.jetbrains.kotlin.parsing.KotlinParsing.parseFile]
diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirExpressionBuilder.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirExpressionBuilder.kt
@@ -63,6 +63,7 @@ class LightTreeRawFirExpressionBuilder(
     tree: FlyweightCapableTreeStructure<LighterASTNode>,
     private val declarationBuilder: LightTreeRawFirDeclarationBuilder,
     context: Context<LighterASTNode> = Context(),
+    val headerCompilationMode: Boolean,
 ) : AbstractLightTreeRawFirBuilder(session, tree, context) {
 
     internal inline fun <reified R : FirExpression> getAsFirExpression(
diff --git a/compiler/fir/raw-fir/light-tree2fir/testFixtures/org/jetbrains/kotlin/fir/lightTree/AbstractLightTree2FirConverterTestCase.kt b/compiler/fir/raw-fir/light-tree2fir/testFixtures/org/jetbrains/kotlin/fir/lightTree/AbstractLightTree2FirConverterTestCase.kt
@@ -25,6 +25,7 @@ abstract class AbstractLightTree2FirConverterTestCase : AbstractRawFirBuilderTes
         val path = Paths.get(filePath)
         val firFile = LightTree2Fir(
             session = FirSessionFactoryHelper.createEmptySession(parseLanguageFeatures(path.readText())),
+            headerCompilationMode = false,
             scopeProvider = StubFirScopeProvider,
             diagnosticsReporter = null
         ).buildFirFile(path)
diff --git a/compiler/fir/raw-fir/light-tree2fir/tests/org/jetbrains/kotlin/fir/lightTree/TotalKotlinTest.kt b/compiler/fir/raw-fir/light-tree2fir/tests/org/jetbrains/kotlin/fir/lightTree/TotalKotlinTest.kt
@@ -56,6 +56,7 @@ class TotalKotlinTest : AbstractRawFirBuilderTestCase() {
         @OptIn(ObsoleteTestInfrastructure::class)
         val lightTreeConverter = LightTree2Fir(
             session = FirSessionFactoryHelper.createEmptySession(),
+            headerCompilationMode = false,
             scopeProvider = StubFirScopeProvider,
             diagnosticsReporter = null
         )
diff --git a/compiler/fir/raw-fir/light-tree2fir/tests/org/jetbrains/kotlin/fir/lightTree/compare/TreesCompareTest.kt b/compiler/fir/raw-fir/light-tree2fir/tests/org/jetbrains/kotlin/fir/lightTree/compare/TreesCompareTest.kt
@@ -62,6 +62,7 @@ class TreesCompareTest : AbstractRawFirBuilderTestCase() {
 
         val lightTreeConverter = LightTree2Fir(
             session = session,
+            headerCompilationMode = false,
             scopeProvider = StubFirScopeProvider,
             diagnosticsReporter = null
         )
@@ -97,6 +98,7 @@ class TreesCompareTest : AbstractRawFirBuilderTestCase() {
 
         val lightTreeConverter = LightTree2Fir(
             session = session,
+            headerCompilationMode = false,
             scopeProvider = StubFirScopeProvider,
             diagnosticsReporter = null
         )
diff --git a/compiler/tests-compiler-utils/testFixtures/org/jetbrains/kotlin/fir/FirAnalyzerFacade.kt b/compiler/tests-compiler-utils/testFixtures/org/jetbrains/kotlin/fir/FirAnalyzerFacade.kt
@@ -38,7 +38,7 @@ class FirAnalyzerFacade(
     private fun buildRawFir() {
         if (firFiles != null) return
         firFiles = when (parser) {
-            FirParser.LightTree -> session.buildFirViaLightTree(lightTreeFiles, diagnosticReporterForLightTree, reportFilesAndLines = null)
+            FirParser.LightTree -> session.buildFirViaLightTree(lightTreeFiles, diagnosticReporterForLightTree, false, reportFilesAndLines = null)
             FirParser.Psi -> session.buildFirFromKtFiles(ktFiles)
         }
     }
diff --git a/js/js.tests/testFixtures/org/jetbrains/kotlin/incremental/FirAbstractInvalidationTest.kt b/js/js.tests/testFixtures/org/jetbrains/kotlin/incremental/FirAbstractInvalidationTest.kt
@@ -135,6 +135,7 @@ abstract class FirAbstractInvalidationTest(
             incrementalDataProvider = null,
             lookupTracker = null,
             useWasmPlatform = false,
+            headerCompilationMode = false,
         )
 
         val fir2IrActualizedResult = transformFirToIr(moduleStructure, analyzedOutput.output, diagnosticsReporter)
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/FirFrontend.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/FirFrontend.kt
@@ -8,6 +8,7 @@ import org.jetbrains.kotlin.cli.common.fir.FirDiagnosticsCompilerResultsReporter
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
+import org.jetbrains.kotlin.config.headerCompilation
 import org.jetbrains.kotlin.diagnostics.DiagnosticReporterFactory
 import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector
 import org.jetbrains.kotlin.fir.*
@@ -123,7 +124,7 @@ internal fun PhaseContext.firFrontendWithLightTree(input: KotlinCoreEnvironment)
             isCommonSource = { groupedSources.isCommonSourceForLt(it) },
             fileBelongsToModule = { file, it -> groupedSources.fileBelongsToModuleForLt(file, it) },
             buildResolveAndCheckFir = { session, files, diagnosticsReporter ->
-                buildResolveAndCheckFirViaLightTree(session, files, diagnosticsReporter, null)
+                buildResolveAndCheckFirViaLightTree(session, files, diagnosticsReporter, configuration.headerCompilation, null)
             },
     )
 }

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ object JvmFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, J`
`263`	`263`	`val countFilesAndLines = if (perfManager == null) null else perfManager::addSourcesStats`
`264`	`264`	`val outputs = sessionsWithSources.map { (session, sources) ->`
`265`	`265`	`val rawFirFiles = when (configuration.useLightTree) {`
`266`		`- true -> session.buildFirViaLightTree(sources, diagnosticsCollector, countFilesAndLines)`
	`266`	`+ true -> session.buildFirViaLightTree(sources, diagnosticsCollector, configuration.headerCompilation, countFilesAndLines)`
`267`	`267`	`else -> session.buildFirFromKtFiles(sources.asKtFilesList())`
`268`	`268`	`}`
`269`	`269`	`resolveAndCheckFir(session, rawFirFiles, diagnosticsCollector)`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.cli.pipeline.PerformanceNotifications`
`32`	`32`	`import org.jetbrains.kotlin.cli.pipeline.PipelinePhase`
`33`	`33`	`import org.jetbrains.kotlin.cli.pipeline.jvm.asKtFilesList`
`34`	`34`	`import org.jetbrains.kotlin.config.CommonConfigurationKeys`
	`35`	`+import org.jetbrains.kotlin.config.headerCompilation`
`35`	`36`	`import org.jetbrains.kotlin.config.messageCollector`
`36`	`37`	`import org.jetbrains.kotlin.config.moduleName`
`37`	`38`	`import org.jetbrains.kotlin.config.perfManager`
`@@ -110,7 +111,7 @@ object MetadataFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifa`
`110`	`111`	`}`
`111`	`112`	`)`
`112`	`113`	`sessionsWithSources.map { (session, files) ->`
`113`		`- val firFiles = session.buildFirViaLightTree(files, diagnosticsReporter) { files, lines ->`
	`114`	`+ val firFiles = session.buildFirViaLightTree(files, diagnosticsReporter, configuration.headerCompilation) { files, lines ->`
`114`	`115`	`perfManager?.addSourcesStats(files, lines)`
`115`	`116`	`}`
`116`	`117`	`resolveAndCheckFir(session, firFiles, diagnosticsReporter)`