[Compiler] Pass information about plugin-generated files from compiler to IC

demiurg906 · liamoberg · commit db299a8393c3 · 2025-08-26T21:41:09.000Z
^KT-55982
^KT-75864
diff --git a/build-common/src/org/jetbrains/kotlin/incremental/ICFileMappingTrackerImpl.kt b/build-common/src/org/jetbrains/kotlin/incremental/ICFileMappingTrackerImpl.kt
@@ -13,4 +13,12 @@ class ICFileMappingTrackerImpl(private val outputItemsCollector: OutputItemsColl
     override fun recordSourceFilesToOutputFileMapping(sourceFiles: Collection<File>, outputFile: File) {
         outputItemsCollector.add(sourceFiles, outputFile)
     }
+
+    override fun recordSourceReferencedByCompilerPlugin(sourceFile: File) {
+        // nothing yet
+    }
+
+    override fun recordOutputFileGeneratedForPlugin(outputFile: File) {
+        // nothing yet
+    }
 }
diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/output/output.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/output/output.kt
@@ -26,6 +26,9 @@ interface OutputFileCollection {
 interface OutputFile {
     val relativePath: String
     val sourceFiles: List<File>
+    val generatedForCompilerPlugin: Boolean
+        get() = false
+
     fun asByteArray(): ByteArray
     fun asText(): String
 }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.metadata.jvm.deserialization.serializeToByteArray
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
+import org.jetbrains.kotlin.utils.addToStdlib.runIf
 import org.jetbrains.org.objectweb.asm.Type
 import java.io.File
 import java.nio.charset.StandardCharsets
@@ -31,6 +32,7 @@ class ClassFileFactory(
     private val finalizers: List<ClassFileFactoryFinalizerExtension>
 ) : OutputFileCollection {
     private val generators: MutableMap<String, OutAndSourceFileList> = Collections.synchronizedMap(LinkedHashMap())
+    private val generatedForCompilerPluginOutputs: MutableSet<String> = LinkedHashSet()
 
     private var isDone = false
 
@@ -39,10 +41,14 @@ class ClassFileFactory(
 
     fun newVisitor(origin: JvmDeclarationOrigin, asmType: Type, sourceFiles: List<File>): ClassBuilder {
         val answer = builderFactory.newClassBuilder(origin)
+        val classFileName = asmType.internalName + ".class"
         generators.put(
-            asmType.internalName + ".class",
+            classFileName,
             ClassBuilderAndSourceFileList(answer, sourceFiles)
         )
+        if (origin.generatedForCompilerPlugin) {
+            generatedForCompilerPluginOutputs.add(classFileName)
+        }
         return answer
     }
 
@@ -117,10 +123,12 @@ class ClassFileFactory(
     }
 
     val currentOutput: List<OutputFile>
-        get() = generators.keys.map { OutputClassFile(it) }
+        get() = generators.keys.map { OutputClassFile(relativePath = it, generatedForCompilerPlugin = it in generatedForCompilerPluginOutputs) }
 
     override fun get(relativePath: String): OutputFile? {
-        return if (generators.containsKey(relativePath)) OutputClassFile(relativePath) else null
+        return runIf(generators.containsKey(relativePath)) {
+            OutputClassFile(relativePath, generatedForCompilerPlugin = relativePath in generatedForCompilerPluginOutputs)
+        }
     }
 
     @TestOnly
@@ -183,7 +191,10 @@ class ClassFileFactory(
         }
     }
 
-    private inner class OutputClassFile(override val relativePath: String) : OutputFile {
+    private inner class OutputClassFile(
+        override val relativePath: String,
+        override val generatedForCompilerPlugin: Boolean,
+    ) : OutputFile {
         override val sourceFiles: List<File>
             get() {
                 val pair: OutAndSourceFileList = generators[this.relativePath]!!
diff --git a/compiler/backend/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt b/compiler/backend/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt
@@ -21,6 +21,12 @@ open class JvmDeclarationOrigin(
     open val originalSourceElement: Any?
         get() = element
 
+    /**
+     * This property indicates that the declaration was generated for top-level declarations generated by the frontend compiler plugin.
+     */
+    open val generatedForCompilerPlugin: Boolean
+        get() = false
+
     override fun toString(): String =
         if (this == NO_ORIGIN) "NO_ORIGIN" else "origin=$originKind element=${element?.javaClass?.simpleName} descriptor=$descriptor"
 
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/output/outputUtils.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/output/outputUtils.kt
@@ -57,7 +57,17 @@ fun OutputFileCollection.writeAll(
     try {
         if (!reportOutputFiles && fileMappingTracker == null) writeAllTo(outputDir)
         else writeAll(outputDir) { outputInfo, output ->
-            fileMappingTracker?.recordSourceFilesToOutputFileMapping(outputInfo.sourceFiles, output)
+            fileMappingTracker?.let { tracker ->
+                when (outputInfo.generatedForCompilerPlugin) {
+                    false -> tracker.recordSourceFilesToOutputFileMapping(outputInfo.sourceFiles, output)
+                    true -> {
+                        check(outputInfo.sourceFiles.none { it.exists() }) {
+                            "Plugin generated file shouldn't have sources, but got ${outputInfo.sourceFiles.joinToString { it.path }}"
+                        }
+                        tracker.recordSourceFilesToOutputFileMapping(outputInfo.sourceFiles, output)
+                    }
+                }
+            }
             if (reportOutputFiles) {
                 messageCollector.report(CompilerMessageSeverity.OUTPUT, OutputMessageUtil.formatOutputMessage(outputInfo.sourceFiles, output))
             }
diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/IncrementalPassThroughLookupTrackerComponent.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/IncrementalPassThroughLookupTrackerComponent.kt
@@ -8,14 +8,22 @@ package org.jetbrains.kotlin.fir
 import org.jetbrains.kotlin.KtPsiSourceElement
 import org.jetbrains.kotlin.KtSourceElement
 import org.jetbrains.kotlin.diagnostics.DiagnosticUtils.getLineAndColumnInPsiFile
+import org.jetbrains.kotlin.fir.resolve.providers.firProvider
+import org.jetbrains.kotlin.fir.resolve.providers.getContainingFile
+import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
+import org.jetbrains.kotlin.fir.symbols.SymbolInternals
+import org.jetbrains.kotlin.incremental.components.ICFileMappingTracker
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.incremental.components.Position
 import org.jetbrains.kotlin.incremental.components.ScopeKind
 import org.jetbrains.kotlin.utils.SmartList
+import java.io.File
 import java.util.concurrent.ConcurrentHashMap
 
 class IncrementalPassThroughLookupTrackerComponent(
+    private val session: FirSession,
     private val lookupTracker: LookupTracker,
+    private val fileMappingTracker: ICFileMappingTracker?,
     private val sourceToFilePath: (KtSourceElement) -> String?
 ) : FirLookupTrackerComponent() {
 
@@ -44,4 +52,12 @@ class IncrementalPassThroughLookupTrackerComponent(
     override fun recordLookup(name: String, inScope: String, source: KtSourceElement?, fileSource: KtSourceElement?) {
         recordLookup(name, SmartList(inScope), source, fileSource)
     }
+
+    @OptIn(SymbolInternals::class)
+    override fun recordDirtyDeclaration(symbol: FirBasedSymbol<*>) {
+        if (fileMappingTracker == null) return
+        val containingFile = session.firProvider.getContainingFile(symbol) ?: return
+        val sourceFile = containingFile.sourceFile?.path?.let { File(it) } ?: return
+        fileMappingTracker.recordSourceReferencedByCompilerPlugin(sourceFile)
+    }
 }
diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/ComponentsContainers.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/ComponentsContainers.kt
@@ -64,6 +64,7 @@ import org.jetbrains.kotlin.fir.serialization.FirProvidedDeclarationsForMetadata
 import org.jetbrains.kotlin.fir.symbols.FirLazyDeclarationResolver
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.incremental.components.EnumWhenTracker
+import org.jetbrains.kotlin.incremental.components.ICFileMappingTracker
 import org.jetbrains.kotlin.incremental.components.ImportTracker
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.load.java.JavaTypeEnhancementState
@@ -211,6 +212,7 @@ fun FirSession.registerResolveComponents(
     lookupTracker: LookupTracker? = null,
     enumWhenTracker: EnumWhenTracker? = null,
     importTracker: ImportTracker? = null,
+    fileMappingTracker: ICFileMappingTracker? = null,
 ) {
     register(FirQualifierResolver::class, FirQualifierResolverImpl(this))
     register(FirTypeResolver::class, FirTypeResolverImpl(this))
@@ -222,7 +224,7 @@ fun FirSession.registerResolveComponents(
         }
         register(
             FirLookupTrackerComponent::class,
-            IncrementalPassThroughLookupTrackerComponent(lookupTracker, firFileToPath)
+            IncrementalPassThroughLookupTrackerComponent(this, lookupTracker, fileMappingTracker, firFileToPath)
         )
     }
     if (enumWhenTracker != null) {
diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirAbstractSessionFactory.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirAbstractSessionFactory.kt
@@ -243,7 +243,8 @@ abstract class FirAbstractSessionFactory<LIBRARY_CONTEXT, SOURCE_CONTEXT> {
             registerResolveComponents(
                 configuration.lookupTracker,
                 configuration.enumWhenTracker,
-                configuration.importTracker
+                configuration.importTracker,
+                configuration.fileMappingTracker,
             )
             registerCliCompilerOnlyResolveComponents()
             registerSourceSessionComponents(context)
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.KtFakeSourceElementKind
 import org.jetbrains.kotlin.KtPsiSourceFileLinesMapping
 import org.jetbrains.kotlin.KtSourceFileLinesMappingFromLineStartOffsets
 import org.jetbrains.kotlin.backend.common.CommonBackendErrors
+import org.jetbrains.kotlin.backend.common.fileForTopLevelPluginDeclarations
 import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
@@ -152,6 +153,9 @@ class Fir2IrConverter(
             moduleDescriptor.getPackage(file.packageFqName).fragments.first(),
             moduleFragment
         )
+        if (file.origin is FirDeclarationOrigin.Synthetic.PluginFile) {
+            irFile.fileForTopLevelPluginDeclarations = true
+        }
         declarationStorage.registerFile(file, irFile)
         for (declaration in file.declarations) {
             when (declaration) {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirPredicateBasedProviderImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirPredicateBasedProviderImpl.kt
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.fir.extensions.predicate.AbstractPredicate
 import org.jetbrains.kotlin.fir.extensions.predicate.DeclarationPredicate
 import org.jetbrains.kotlin.fir.extensions.predicate.LookupPredicate
 import org.jetbrains.kotlin.fir.extensions.predicate.PredicateVisitor
+import org.jetbrains.kotlin.fir.lookupTracker
 import org.jetbrains.kotlin.fir.resolve.fqName
 import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
@@ -36,7 +37,10 @@ class FirPredicateBasedProviderImpl(private val session: FirSession) : FirPredic
         val declarations = annotations.flatMapTo(mutableSetOf()) {
             cache.declarationByAnnotation[it] + cache.declarationsUnderAnnotated[it]
         }
-        return declarations.filter { matches(predicate, it) }.map { it.symbol }
+        return declarations
+            .filter { matches(predicate, it) }
+            .map { it.symbol }
+            .onEach { session.lookupTracker?.recordDirtyDeclaration(it) }
     }
 
     override fun fileHasPluginAnnotations(file: FirFile): Boolean {
diff --git a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/FirLookupTrackerComponent.kt b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/FirLookupTrackerComponent.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir
 
 import org.jetbrains.kotlin.KtSourceElement
 import org.jetbrains.kotlin.fir.resolve.calls.AbstractCallInfo
+import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
 import org.jetbrains.kotlin.fir.types.*
@@ -22,6 +23,8 @@ abstract class FirLookupTrackerComponent : FirSessionComponent {
     abstract fun recordLookup(name: String, inScopes: Iterable<String>, source: KtSourceElement?, fileSource: KtSourceElement?)
 
     abstract fun recordLookup(name: String, inScope: String, source: KtSourceElement?, fileSource: KtSourceElement?)
+
+    abstract fun recordDirtyDeclaration(symbol: FirBasedSymbol<*>)
 }
 
 fun FirLookupTrackerComponent.recordCallLookup(callInfo: AbstractCallInfo, inType: ConeKotlinType) {
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CommonIrAttributes.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CommonIrAttributes.kt
@@ -41,3 +41,9 @@ var IrSimpleFunction.customNameInReflection: Name? by irAttribute(copyByDefault
  * Flags calls which are the result of an implicit `invoke` operator call.
  */
 var IrCall.implicitInvoke: Boolean by irFlag(copyByDefault = false)
+
+/**
+ * Indicates that this file was synthetically created as a container for top-level declarations,
+ * generated by FIR plugins.
+ */
+var IrFile.fileForTopLevelPluginDeclarations: Boolean by irFlag(copyByDefault = false)
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/extensions/JvmIrDeclarationOrigin.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/extensions/JvmIrDeclarationOrigin.kt
@@ -6,12 +6,14 @@
 package org.jetbrains.kotlin.backend.jvm.extensions
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.backend.common.fileForTopLevelPluginDeclarations
 import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
 import org.jetbrains.kotlin.backend.jvm.ir.isEffectivelyInlineOnly
 import org.jetbrains.kotlin.backend.jvm.ir.psiElement
 import org.jetbrains.kotlin.ir.PsiSourceManager
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor
+import org.jetbrains.kotlin.ir.util.fileOrNull
 import org.jetbrains.kotlin.psi.KtPropertyDelegate
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
@@ -24,6 +26,9 @@ class JvmIrDeclarationOrigin(
 ) : JvmDeclarationOrigin(originKind, element, declaration?.toIrBasedDescriptor()) {
     override val originalSourceElement: Any?
         get() = declaration?.attributeOwnerId
+
+    override val generatedForCompilerPlugin: Boolean
+        get() = declaration?.fileOrNull?.fileForTopLevelPluginDeclarations == true
 }
 
 val IrDeclaration.descriptorOrigin: JvmIrDeclarationOrigin
diff --git a/core/compiler.common/src/org/jetbrains/kotlin/incremental/components/ICFileMappingTracker.kt b/core/compiler.common/src/org/jetbrains/kotlin/incremental/components/ICFileMappingTracker.kt
@@ -9,8 +9,12 @@ import java.io.File
 
 interface ICFileMappingTracker {
     fun recordSourceFilesToOutputFileMapping(sourceFiles: Collection<File>, outputFile: File)
+    fun recordSourceReferencedByCompilerPlugin(sourceFile: File)
+    fun recordOutputFileGeneratedForPlugin(outputFile: File)
 
     object DoNothing : ICFileMappingTracker {
         override fun recordSourceFilesToOutputFileMapping(sourceFiles: Collection<File>, outputFile: File) {}
+        override fun recordSourceReferencedByCompilerPlugin(sourceFile: File) {}
+        override fun recordOutputFileGeneratedForPlugin(outputFile: File) {}
     }
 }
diff --git a/plugins/kapt/kapt-compiler/src/org/jetbrains/kotlin/kapt/FirKaptAnalysisHandlerExtension.kt b/plugins/kapt/kapt-compiler/src/org/jetbrains/kotlin/kapt/FirKaptAnalysisHandlerExtension.kt
@@ -276,10 +276,16 @@ open class FirKaptAnalysisHandlerExtension(
 
         val reportOutputFiles = kaptContext.generationState.configuration.getBoolean(CommonConfigurationKeys.REPORT_OUTPUT_FILES)
         kaptContext.generationState.factory.writeAll(incrementalDataOutputDir) { outputInfo, output ->
-            kaptContext.generationState.configuration.fileMappingTracker?.recordSourceFilesToOutputFileMapping(
-                outputInfo.sourceFiles,
-                output
-            )
+            kaptContext.generationState.configuration.fileMappingTracker?.let {
+                when (outputInfo.generatedForCompilerPlugin) {
+                    false -> it.recordSourceFilesToOutputFileMapping(
+                        outputInfo.sourceFiles,
+                        output
+                    )
+
+                    true -> it.recordOutputFileGeneratedForPlugin(output)
+                }
+            }
             if (reportOutputFiles) {
                 messageCollector.report(OUTPUT, OutputMessageUtil.formatOutputMessage(outputInfo.sourceFiles, output))
             }

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,12 @@ class ICFileMappingTrackerImpl(private val outputItemsCollector: OutputItemsColl`
`13`	`13`	`override fun recordSourceFilesToOutputFileMapping(sourceFiles: Collection<File>, outputFile: File) {`
`14`	`14`	`outputItemsCollector.add(sourceFiles, outputFile)`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+ override fun recordSourceReferencedByCompilerPlugin(sourceFile: File) {`
	`18`	`+ // nothing yet`
	`19`	`+ }`
	`20`	`+`
	`21`	`+ override fun recordOutputFileGeneratedForPlugin(outputFile: File) {`
	`22`	`+ // nothing yet`
	`23`	`+ }`
`16`	`24`	`}`