azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid cache corruption on compile error

Browse Source 
#KT-11874 fixed
This commit is contained in:
Alexey Tsvetkov
2016-05-11 16:18:07 +03:00
parent 09caa65806
commit b4d47df52b
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+16 -11
View File
@@ -351,6 +351,12 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
if (exitCode != ExitCode.OK) { if (exitCode != ExitCode.OK) {
cleanupOnError() cleanupOnError()
} }
lookupStorage.flush(false)
lookupStorage.close()
caches.values.forEach { it.flush(false); it.close() }
logger.debug("flushed incremental caches")
when (exitCode) { when (exitCode) {
ExitCode.COMPILATION_ERROR -> throw GradleException("Compilation error. See log for more details") ExitCode.COMPILATION_ERROR -> throw GradleException("Compilation error. See log for more details")
ExitCode.INTERNAL_ERROR -> throw GradleException("Internal compiler error. See log for more details") ExitCode.INTERNAL_ERROR -> throw GradleException("Internal compiler error. See log for more details")
@@ -379,6 +385,7 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
kaptAnnotationsFileUpdater = null kaptAnnotationsFileUpdater = null
} }
var exitCode = ExitCode.OK
while (sourcesToCompile.any() || currentRemoved.any()) { while (sourcesToCompile.any() || currentRemoved.any()) {
val removedAndModified = (sourcesToCompile + currentRemoved).toList() val removedAndModified = (sourcesToCompile + currentRemoved).toList()
val outdatedClasses = targets.flatMap { getIncrementalCache(it).classesBySources(removedAndModified) } val outdatedClasses = targets.flatMap { getIncrementalCache(it).classesBySources(removedAndModified) }
@@ -399,7 +406,8 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
val text = existingSource.map { it.canonicalPath }.joinToString(separator = System.getProperty("line.separator")) val text = existingSource.map { it.canonicalPath }.joinToString(separator = System.getProperty("line.separator"))
dirtySourcesSinceLastTimeFile.writeText(text) dirtySourcesSinceLastTimeFile.writeText(text)
val (exitCode, generatedFiles) = compileChanged(targets, existingSource.toSet(), outputDir, args, ::getIncrementalCache, lookupTracker) val compilerOutput = compileChanged(targets, existingSource.toSet(), outputDir, args, ::getIncrementalCache, lookupTracker)
exitCode = compilerOutput.exitCode
if (exitCode == ExitCode.OK) { if (exitCode == ExitCode.OK) {
dirtySourcesSinceLastTimeFile.delete() dirtySourcesSinceLastTimeFile.delete()
@@ -407,18 +415,18 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
} }
else { else {
kaptAnnotationsFileUpdater?.revert() kaptAnnotationsFileUpdater?.revert()
break
} }
allGeneratedFiles.addAll(generatedFiles) allGeneratedFiles.addAll(compilerOutput.generatedFiles)
val compilationResult = updateIncrementalCaches(targets, generatedFiles, val compilationResult = updateIncrementalCaches(targets, compilerOutput.generatedFiles,
compiledWithErrors = exitCode != ExitCode.OK, compiledWithErrors = exitCode != ExitCode.OK,
getIncrementalCache = { caches[it]!! }) getIncrementalCache = { caches[it]!! })
lookupStorage.update(lookupTracker, sourcesToCompile, currentRemoved) lookupStorage.update(lookupTracker, sourcesToCompile, currentRemoved)
cacheVersions.forEach { it.saveIfNeeded() } cacheVersions.forEach { it.saveIfNeeded() }
processCompilerExitCode(exitCode)
if (!isIncrementalDecided) break; if (!isIncrementalDecided) break
val (dirtyLookupSymbols, dirtyClassFqNames) = compilationResult.getDirtyData(caches.values, logAction) val (dirtyLookupSymbols, dirtyClassFqNames) = compilationResult.getDirtyData(caches.values, logAction)
sourcesToCompile = mapLookupSymbolsToFiles(lookupStorage, dirtyLookupSymbols, logAction, ::projectRelativePath, excludes = sourcesToCompile) + sourcesToCompile = mapLookupSymbolsToFiles(lookupStorage, dirtyLookupSymbols, logAction, ::projectRelativePath, excludes = sourcesToCompile) +
@@ -428,12 +436,9 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
currentRemoved = listOf() currentRemoved = listOf()
} }
} }
lookupStorage.flush(false)
lookupStorage.close() anyClassesCompiled = allGeneratedFiles.isNotEmpty()
caches.values.forEach { it.flush(false); it.close() } processCompilerExitCode(exitCode)
if (allGeneratedFiles.isNotEmpty()) {
anyClassesCompiled = true
}
} }
private data class CompileChangedResults(val exitCode: ExitCode, val generatedFiles: List<GeneratedFile<TargetId>>) private data class CompileChangedResults(val exitCode: ExitCode, val generatedFiles: List<GeneratedFile<TargetId>>)