From 764231478052030445b28b25bb24b73770bf9f00 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Fri, 28 Oct 2016 00:14:27 +0300
Subject: [PATCH] Always flush caches

---
 .../jetbrains/kotlin/gradle/tasks/Tasks.kt    |  9 ++++-
 .../IncrementalJvmCompilerRunner.kt           | 39 ++++++++++++-------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index 497f7af77c7..a7d57d74be1 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -195,7 +195,14 @@ open class KotlinCompile : AbstractKotlinCompile<K2JVMCompilerArguments>(), Kotl
         )
         args.classpathAsList = classpath.toList()
         args.destinationAsFile = destinationDir
-        compiler.compile(allKotlinSources, args, messageCollector, { changedFiles })
+        try {
+            val exitCode = compiler.compile(allKotlinSources, args, messageCollector, { changedFiles })
+            processCompilerExitCode(exitCode)
+        }
+        catch (e: Throwable) {
+            cleanupOnError()
+            throw e
+        }
         anyClassesCompiled = compiler.anyClassesCompiled
     }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
index 8aa09bc3eb2..670895b2b7d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
@@ -39,7 +39,9 @@ import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
 import org.jetbrains.kotlin.modules.TargetId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.progress.CompilationCanceledStatus
+import java.io.EOFException
 import java.io.File
+import java.io.IOException
 import java.util.*
 
 internal fun makeIncrementally(
@@ -115,6 +117,18 @@ internal class IncrementalJvmCompilerRunner(
         val targetId = TargetId(name = args.moduleName, type = "java-production")
         var caches = IncrementalCachesManager(targetId, cacheDirectory, File(args.destination))
 
+        fun onError(e: Exception): ExitCode {
+            caches.clean()
+            artifactDifferenceRegistryProvider?.clean()
+
+            // todo: warn?
+            reporter.report { "Possible cache corruption. Rebuilding. $e" }
+            // try to rebuild
+            val javaFilesProcessor = ChangedJavaFilesProcessor()
+            caches = IncrementalCachesManager(targetId, cacheDirectory, args.destinationAsFile)
+            return compileIncrementally(args, caches, javaFilesProcessor, allKotlinSources, targetId, CompilationMode.Rebuild, messageCollector)
+        }
+
         return try {
             val javaFilesProcessor = ChangedJavaFilesProcessor()
             val changedFiles = getChangedFiles(caches)
@@ -122,14 +136,17 @@ internal class IncrementalJvmCompilerRunner(
             compileIncrementally(args, caches, javaFilesProcessor, allKotlinSources, targetId, compilationMode, messageCollector)
         }
         catch (e: PersistentEnumeratorBase.CorruptedException) {
-            caches.clean()
-            artifactDifferenceRegistryProvider?.clean()
-
-            reporter.report { "Caches are corrupted. Rebuilding. $e" }
-            // try to rebuild
-            val javaFilesProcessor = ChangedJavaFilesProcessor()
-            caches = IncrementalCachesManager(targetId, cacheDirectory, args.destinationAsFile)
-            compileIncrementally(args, caches, javaFilesProcessor, allKotlinSources, targetId, CompilationMode.Rebuild, messageCollector)
+            onError(e)
+        }
+        catch (e: IOException) {
+            onError(e)
+        }
+        finally {
+            artifactDifferenceRegistryProvider?.withRegistry(reporter) {
+                it.flush(memoryCachesOnly = true)
+            }
+            caches.close(flush = true)
+            reporter.report { "flushed incremental caches" }
         }
     }
 
@@ -394,12 +411,6 @@ internal class IncrementalJvmCompilerRunner(
             }
         }
 
-        artifactDifferenceRegistryProvider?.withRegistry(reporter) {
-            it.flush(memoryCachesOnly = true)
-        }
-        caches.close(flush = true)
-        reporter.report { "flushed incremental caches" }
-
         if (exitCode == ExitCode.OK) {
             sourceAnnotationsRegistry?.flush()
             cacheVersions.forEach { it.saveIfNeeded() }