Disable checkers and platform checkers in header mode.

aviroop-123 · aviroop-123 · commit 07f4d3e5b3e6 · 2025-10-05T05:36:00.000Z
^KT-78422
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
@@ -129,6 +129,7 @@ object WebFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, W
                 incrementalDataProvider = configuration.incrementalDataProvider,
                 lookupTracker = lookupTracker,
                 useWasmPlatform = isWasm,
+                headerCompilationMode = configuration.headerCompilation
             )
         }
 
@@ -152,6 +153,7 @@ object WebFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, W
         incrementalDataProvider: IncrementalDataProvider?,
         lookupTracker: LookupTracker?,
         useWasmPlatform: Boolean,
+        headerCompilationMode: Boolean
     ): AnalyzedFirWithPsiOutput {
         for (ktFile in ktFiles) {
             AnalyzerWithCompilerReport.reportSyntaxErrors(ktFile, diagnosticsReporter)
@@ -166,11 +168,11 @@ object WebFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, W
             isCommonSource = isCommonSourceForPsi,
             fileBelongsToModule = fileBelongsToModuleForPsi,
             buildResolveAndCheckFir = { session, files ->
-                buildResolveAndCheckFirFromKtFiles(session, files, diagnosticsReporter)
+                buildResolveAndCheckFirFromKtFiles(session, files, diagnosticsReporter, headerCompilationMode)
             },
             useWasmPlatform = useWasmPlatform,
         )
-        output.runPlatformCheckers(diagnosticsReporter)
+        output.runPlatformCheckers(diagnosticsReporter, headerCompilationMode)
         return AnalyzedFirWithPsiOutput(output, ktFiles)
     }
 
@@ -201,7 +203,7 @@ object WebFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, W
             },
             useWasmPlatform = useWasmPlatform,
         )
-        output.runPlatformCheckers(diagnosticsReporter)
+        output.runPlatformCheckers(diagnosticsReporter, headerCompilationMode)
         return AnalyzedFirOutput(output)
     }
 
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
@@ -99,7 +99,7 @@ private fun FrontendContext.compileModuleToAnalyzedFirViaLightTreeIncrementally(
         val outputs = sessionsWithSources.map { (session, sources) ->
             buildResolveAndCheckFirViaLightTree(session, sources, diagnosticsReporter, configuration.headerCompilation, countFilesAndLines)
         }
-        outputs.runPlatformCheckers(diagnosticsReporter)
+        outputs.runPlatformCheckers(diagnosticsReporter, configuration.headerCompilation)
         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
@@ -266,9 +266,9 @@ object JvmFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, J
                 true -> session.buildFirViaLightTree(sources, diagnosticsCollector, configuration.headerCompilation, countFilesAndLines)
                 else -> session.buildFirFromKtFiles(sources.asKtFilesList())
             }
-            resolveAndCheckFir(session, rawFirFiles, diagnosticsCollector)
+            resolveAndCheckFir(session, rawFirFiles, diagnosticsCollector, configuration.headerCompilation)
         }
-        outputs.runPlatformCheckers(diagnosticsCollector)
+        outputs.runPlatformCheckers(diagnosticsCollector, configuration.headerCompilation)
 
         val kotlinPackageUsageIsFine = when (configuration.useLightTree) {
             true -> outputs.all { checkKotlinPackageUsageForLightTree(configuration, it.fir) }
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
@@ -114,7 +114,7 @@ object MetadataFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifa
                 val firFiles = session.buildFirViaLightTree(files, diagnosticsReporter, configuration.headerCompilation) { files, lines ->
                     perfManager?.addSourcesStats(files, lines)
                 }
-                resolveAndCheckFir(session, firFiles, diagnosticsReporter)
+                resolveAndCheckFir(session, firFiles, diagnosticsReporter, configuration.headerCompilation)
             }
         } else {
             val projectEnvironment = VfsBasedProjectEnvironment(
@@ -150,11 +150,11 @@ object MetadataFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifa
 
             sessionsWithSources.map { (session, files) ->
                 val firFiles = session.buildFirFromKtFiles(files)
-                resolveAndCheckFir(session, firFiles, diagnosticsReporter)
+                resolveAndCheckFir(session, firFiles, diagnosticsReporter, configuration.headerCompilation)
             }
         }
 
-        outputs.runPlatformCheckers(diagnosticsReporter)
+        outputs.runPlatformCheckers(diagnosticsReporter, configuration.headerCompilation)
 
         when (configuration.useLightTree) {
             true -> outputs.all { checkKotlinPackageUsageForLightTree(configuration, it.fir) }
diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/pipeline/convertToIr.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/pipeline/convertToIr.kt
@@ -76,7 +76,8 @@ data class Fir2IrActualizedResult(
     val symbolTable: SymbolTable,
 )
 
-fun List<ModuleCompilerAnalyzedOutput>.runPlatformCheckers(reporter: BaseDiagnosticsCollector) {
+fun List<ModuleCompilerAnalyzedOutput>.runPlatformCheckers(reporter: BaseDiagnosticsCollector, headerCompilationMode: Boolean) {
+    if (headerCompilationMode) return
     val platformModule = this.last()
     val session = platformModule.session
     val scopeSession = platformModule.scopeSession
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
@@ -60,9 +60,10 @@ fun FirSession.buildFirFromKtFiles(ktFiles: Collection<KtFile>): List<FirFile> {
 fun buildResolveAndCheckFirFromKtFiles(
     session: FirSession,
     ktFiles: List<KtFile>,
-    diagnosticsReporter: BaseDiagnosticsCollector
+    diagnosticsReporter: BaseDiagnosticsCollector,
+    headerCompilationMode: Boolean
 ): ModuleCompilerAnalyzedOutput {
-    return resolveAndCheckFir(session, session.buildFirFromKtFiles(ktFiles), diagnosticsReporter)
+    return resolveAndCheckFir(session, session.buildFirFromKtFiles(ktFiles), diagnosticsReporter, headerCompilationMode)
 }
 
 /**
@@ -72,10 +73,13 @@ fun buildResolveAndCheckFirFromKtFiles(
 fun resolveAndCheckFir(
     session: FirSession,
     firFiles: List<FirFile>,
-    diagnosticsReporter: BaseDiagnosticsCollector
+    diagnosticsReporter: BaseDiagnosticsCollector,
+    headerCompilationMode: Boolean
 ): ModuleCompilerAnalyzedOutput {
     val (scopeSession, fir) = session.runResolution(firFiles)
-    session.runCheckers(scopeSession, fir, diagnosticsReporter, MppCheckerKind.Common)
+    if (!headerCompilationMode) {
+        session.runCheckers(scopeSession, fir, diagnosticsReporter, MppCheckerKind.Common)
+    }
     return ModuleCompilerAnalyzedOutput(session, scopeSession, fir)
 }
 
@@ -87,5 +91,5 @@ fun buildResolveAndCheckFirViaLightTree(
     countFilesAndLines: KFunction2<Int, Int, Unit>?
 ): ModuleCompilerAnalyzedOutput {
     val firFiles = session.buildFirViaLightTree(ktFiles, diagnosticsReporter, headerCompilationMode, countFilesAndLines)
-    return resolveAndCheckFir(session, firFiles, diagnosticsReporter)
+    return resolveAndCheckFir(session, firFiles, diagnosticsReporter, headerCompilationMode)
 }
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
@@ -75,7 +75,7 @@ internal inline fun <F> PhaseContext.firFrontend(
         }
     }
 
-    outputs.runPlatformCheckers(diagnosticsReporter)
+    outputs.runPlatformCheckers(diagnosticsReporter, configuration.headerCompilation)
 
     FirDiagnosticsCompilerResultsReporter.reportToMessageCollector(diagnosticsReporter, messageCollector, renderDiagnosticNames)
     return if (syntaxErrors || diagnosticsReporter.hasErrors) {
@@ -100,7 +100,7 @@ internal fun PhaseContext.firFrontendWithPsi(input: KotlinCoreEnvironment): FirO
             isCommonSource = isCommonSourceForPsi,
             fileBelongsToModule = fileBelongsToModuleForPsi,
             buildResolveAndCheckFir = { session, files, diagnosticsReporter ->
-                buildResolveAndCheckFirFromKtFiles(session, files, diagnosticsReporter)
+                buildResolveAndCheckFirFromKtFiles(session, files, diagnosticsReporter, configuration.headerCompilation)
             },
     )
 }

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ object WebFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, W`
`129`	`129`	`incrementalDataProvider = configuration.incrementalDataProvider,`
`130`	`130`	`lookupTracker = lookupTracker,`
`131`	`131`	`useWasmPlatform = isWasm,`
	`132`	`+ headerCompilationMode = configuration.headerCompilation`
`132`	`133`	`)`
`133`	`134`	`}`
`134`	`135`
`@@ -152,6 +153,7 @@ object WebFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, W`
`152`	`153`	`incrementalDataProvider: IncrementalDataProvider?,`
`153`	`154`	`lookupTracker: LookupTracker?,`
`154`	`155`	`useWasmPlatform: Boolean,`
	`156`	`+ headerCompilationMode: Boolean`
`155`	`157`	`): AnalyzedFirWithPsiOutput {`
`156`	`158`	`for (ktFile in ktFiles) {`
`157`	`159`	`AnalyzerWithCompilerReport.reportSyntaxErrors(ktFile, diagnosticsReporter)`
`@@ -166,11 +168,11 @@ object WebFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, W`
`166`	`168`	`isCommonSource = isCommonSourceForPsi,`
`167`	`169`	`fileBelongsToModule = fileBelongsToModuleForPsi,`
`168`	`170`	`buildResolveAndCheckFir = { session, files ->`
`169`		`- buildResolveAndCheckFirFromKtFiles(session, files, diagnosticsReporter)`
	`171`	`+ buildResolveAndCheckFirFromKtFiles(session, files, diagnosticsReporter, headerCompilationMode)`
`170`	`172`	`},`
`171`	`173`	`useWasmPlatform = useWasmPlatform,`
`172`	`174`	`)`
`173`		`- output.runPlatformCheckers(diagnosticsReporter)`
	`175`	`+ output.runPlatformCheckers(diagnosticsReporter, headerCompilationMode)`
`174`	`176`	`return AnalyzedFirWithPsiOutput(output, ktFiles)`
`175`	`177`	`}`
`176`	`178`
`@@ -201,7 +203,7 @@ object WebFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, W`
`201`	`203`	`},`
`202`	`204`	`useWasmPlatform = useWasmPlatform,`
`203`	`205`	`)`
`204`		`- output.runPlatformCheckers(diagnosticsReporter)`
	`206`	`+ output.runPlatformCheckers(diagnosticsReporter, headerCompilationMode)`
`205`	`207`	`return AnalyzedFirOutput(output)`
`206`	`208`	`}`
`207`	`209`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ private fun FrontendContext.compileModuleToAnalyzedFirViaLightTreeIncrementally(`
`99`	`99`	`val outputs = sessionsWithSources.map { (session, sources) ->`
`100`	`100`	`buildResolveAndCheckFirViaLightTree(session, sources, diagnosticsReporter, configuration.headerCompilation, countFilesAndLines)`
`101`	`101`	`}`
`102`		`- outputs.runPlatformCheckers(diagnosticsReporter)`
	`102`	`+ outputs.runPlatformCheckers(diagnosticsReporter, configuration.headerCompilation)`
`103`	`103`	`FirResult(outputs)`
`104`	`104`	`}`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -266,9 +266,9 @@ object JvmFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifact, J`
`266`	`266`	`true -> session.buildFirViaLightTree(sources, diagnosticsCollector, configuration.headerCompilation, countFilesAndLines)`
`267`	`267`	`else -> session.buildFirFromKtFiles(sources.asKtFilesList())`
`268`	`268`	`}`
`269`		`- resolveAndCheckFir(session, rawFirFiles, diagnosticsCollector)`
	`269`	`+ resolveAndCheckFir(session, rawFirFiles, diagnosticsCollector, configuration.headerCompilation)`
`270`	`270`	`}`
`271`		`- outputs.runPlatformCheckers(diagnosticsCollector)`
	`271`	`+ outputs.runPlatformCheckers(diagnosticsCollector, configuration.headerCompilation)`
`272`	`272`
`273`	`273`	`val kotlinPackageUsageIsFine = when (configuration.useLightTree) {`
`274`	`274`	`true -> outputs.all { checkKotlinPackageUsageForLightTree(configuration, it.fir) }`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ object MetadataFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifa`
`114`	`114`	`val firFiles = session.buildFirViaLightTree(files, diagnosticsReporter, configuration.headerCompilation) { files, lines ->`
`115`	`115`	`perfManager?.addSourcesStats(files, lines)`
`116`	`116`	`}`
`117`		`- resolveAndCheckFir(session, firFiles, diagnosticsReporter)`
	`117`	`+ resolveAndCheckFir(session, firFiles, diagnosticsReporter, configuration.headerCompilation)`
`118`	`118`	`}`
`119`	`119`	`} else {`
`120`	`120`	`val projectEnvironment = VfsBasedProjectEnvironment(`
`@@ -150,11 +150,11 @@ object MetadataFrontendPipelinePhase : PipelinePhase<ConfigurationPipelineArtifa`
`150`	`150`
`151`	`151`	`sessionsWithSources.map { (session, files) ->`
`152`	`152`	`val firFiles = session.buildFirFromKtFiles(files)`
`153`		`- resolveAndCheckFir(session, firFiles, diagnosticsReporter)`
	`153`	`+ resolveAndCheckFir(session, firFiles, diagnosticsReporter, configuration.headerCompilation)`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`157`		`- outputs.runPlatformCheckers(diagnosticsReporter)`
	`157`	`+ outputs.runPlatformCheckers(diagnosticsReporter, configuration.headerCompilation)`
`158`	`158`
`159`	`159`	`when (configuration.useLightTree) {`
`160`	`160`	`true -> outputs.all { checkKotlinPackageUsageForLightTree(configuration, it.fir) }`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ data class Fir2IrActualizedResult(`
`76`	`76`	`val symbolTable: SymbolTable,`
`77`	`77`	`)`
`78`	`78`
`79`		`-fun List<ModuleCompilerAnalyzedOutput>.runPlatformCheckers(reporter: BaseDiagnosticsCollector) {`
	`79`	`+fun List<ModuleCompilerAnalyzedOutput>.runPlatformCheckers(reporter: BaseDiagnosticsCollector, headerCompilationMode: Boolean) {`
	`80`	`+ if (headerCompilationMode) return`
`80`	`81`	`val platformModule = this.last()`
`81`	`82`	`val session = platformModule.session`
`82`	`83`	`val scopeSession = platformModule.scopeSession`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ internal inline fun <F> PhaseContext.firFrontend(`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`		`- outputs.runPlatformCheckers(diagnosticsReporter)`
	`78`	`+ outputs.runPlatformCheckers(diagnosticsReporter, configuration.headerCompilation)`
`79`	`79`
`80`	`80`	`FirDiagnosticsCompilerResultsReporter.reportToMessageCollector(diagnosticsReporter, messageCollector, renderDiagnosticNames)`
`81`	`81`	`return if (syntaxErrors \|\| diagnosticsReporter.hasErrors) {`
`@@ -100,7 +100,7 @@ internal fun PhaseContext.firFrontendWithPsi(input: KotlinCoreEnvironment): FirO`
`100`	`100`	`isCommonSource = isCommonSourceForPsi,`
`101`	`101`	`fileBelongsToModule = fileBelongsToModuleForPsi,`
`102`	`102`	`buildResolveAndCheckFir = { session, files, diagnosticsReporter ->`
`103`		`- buildResolveAndCheckFirFromKtFiles(session, files, diagnosticsReporter)`
	`103`	`+ buildResolveAndCheckFirFromKtFiles(session, files, diagnosticsReporter, configuration.headerCompilation)`
`104`	`104`	`},`
`105`	`105`	`)`
`106`	`106`	`}`