From d0ca0dca2b76d92957b31ceedbaf1ba583e57a36 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 6 Dec 2017 15:51:52 +0300 Subject: [PATCH] Avoid processing incremental changes after first build for JVM --- .../kotlin/incremental/IncrementalJvmCompilerRunner.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt index e02a12195cc..070a6c2880e 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt @@ -156,11 +156,11 @@ class IncrementalJvmCompilerRunner( dirtyFiles.addAll(dirtyFilesFromFqNames) } - val lastBuildInfo = BuildInfo.read(lastBuildInfoFile) + val lastBuildInfo = BuildInfo.read(lastBuildInfoFile) ?: return CompilationMode.Rebuild { "No information on previous build" } reporter.report { "Last Kotlin Build info -- $lastBuildInfo" } val changesFromFriend by lazy { - val myLastTS = lastBuildInfo?.startTS ?: return@lazy ChangesEither.Unknown() + val myLastTS = lastBuildInfo.startTS val storage = friendBuildHistoryFile?.let { BuildDiffsStorage.readFromFile(it, reporter) } ?: return@lazy ChangesEither.Unknown() val (prevDiffs, newDiffs) = storage.buildDiffs.partition { it.ts < myLastTS }