[JPS] Properly register files to compile

JPS graph needs to know if Kotlin JPS tried to compile some files. Previously, we registered these files only iff compilation succeeded. Now we register them also in case when the compiler fails

(cherry picked from commit 1f502fe)

Author: Aleksei.Cherepanov

jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt

@@ -447,9 +447,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
 
         cleanJsOutputs(context, kotlinChunk, incrementalCaches, kotlinDirtyFilesHolder)
 
-        if (LOG.isDebugEnabled) {
-            LOG.debug("Compiling files: ${kotlinDirtyFilesHolder.allDirtyFiles}")
-        }
+
 
         val start = System.nanoTime()
         val outputItemCollector = doCompileModuleChunk(
@@ -474,6 +472,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
             LOG.info("Compiled with errors")
             return ABORT
         } else {
+            JavaBuilderUtil.registerSuccessfullyCompiled(context, kotlinDirtyFilesHolder.allDirtyFiles)
             LOG.info("Compiled successfully")
         }
 
@@ -618,11 +617,23 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
             }
         }
 
+        registerFilesToCompile(dirtyFilesHolder, context)
         val isDoneSomething = representativeTarget.compileModuleChunk(commonArguments, dirtyFilesHolder, environment)
 
         return if (isDoneSomething) environment.outputItemsCollector else null
     }
 
+    private fun registerFilesToCompile(
+        dirtyFilesHolder: KotlinDirtySourceFilesHolder,
+        context: CompileContext,
+    ) {
+        val allDirtyFiles = dirtyFilesHolder.allDirtyFiles
+        if (LOG.isDebugEnabled) {
+            LOG.debug("Compiling files: $allDirtyFiles")
+        }
+        JavaBuilderUtil.registerFilesToCompile(context, allDirtyFiles)
+    }
+
     private fun createCompileEnvironment(
         context: CompileContext,
         kotlinModuleBuilderTarget: KotlinModuleBuildTarget<*>,

jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt

@@ -418,10 +418,6 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
             }
         }
         // important: in jps-dependency-graph you can't register additional dependencies after [callback.associate].
-
-        val allCompiled = dirtyFilesHolder.allDirtyFiles
-        JavaBuilderUtil.registerFilesToCompile(localContext, allCompiled)
-        JavaBuilderUtil.registerSuccessfullyCompiled(localContext, allCompiled)
     }
 
     private fun processInlineConstTracker(inlineConstTracker: InlineConstTrackerImpl, sourceFile: File, output: GeneratedJvmClass, callback: Backend) {