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

Minimize usage of TargetId in IC

Browse Source
This commit is contained in:
Alexey Tsvetkov
2017-06-30 04:54:43 +03:00
parent a076b4614e
commit d1fd88fb8e
6 changed files with 34 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCachesManager.kt
+1 -3
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.incremental
import org.jetbrains.kotlin.incremental.storage.BasicMapsOwner
import org.jetbrains.kotlin.modules.TargetId
import java.io.File
abstract class IncrementalCachesManager (
@@ -68,12 +67,11 @@ abstract class IncrementalCachesManager (
}
class IncrementalJvmCachesManager(
targetId: TargetId,
cacheDirectory: File,
outputDir: File,
reporter: ICReporter
) : IncrementalCachesManager(cacheDirectory, reporter) {
private val jvmCacheFile = File(cacheDirectory, "jvm").apply { mkdirs() }
val jvmCache = IncrementalCacheImpl(jvmCacheFile, outputDir, targetId).apply { registerCache() }
val jvmCache = IncrementalCacheImpl(jvmCacheFile, outputDir).apply { registerCache() }
}
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
+18 -15
View File
@@ -104,8 +104,7 @@ class IncrementalJvmCompilerRunner(
messageCollector: MessageCollector,
getChangedFiles: (IncrementalCachesManager)->ChangedFiles
): ExitCode {
val targetId = TargetId(name = args.moduleName!!, type = "java-production")
var caches = IncrementalJvmCachesManager(targetId, cacheDirectory, File(args.destination), reporter)
var caches = IncrementalJvmCachesManager(cacheDirectory, File(args.destination), reporter)
fun rebuild(): ExitCode {
caches.clean()
@@ -113,8 +112,8 @@ class IncrementalJvmCompilerRunner(
args.destinationAsFile.deleteRecursively()
val javaFilesProcessor = ChangedJavaFilesProcessor(reporter)
caches = IncrementalJvmCachesManager(targetId, cacheDirectory, args.destinationAsFile, reporter)
return compileIncrementally(args, caches, javaFilesProcessor, allKotlinSources, targetId, CompilationMode.Rebuild, messageCollector)
caches = IncrementalJvmCachesManager(cacheDirectory, args.destinationAsFile, reporter)
return compileIncrementally(args, caches, javaFilesProcessor, allKotlinSources, CompilationMode.Rebuild, messageCollector)
}
return try {
@@ -124,7 +123,7 @@ class IncrementalJvmCompilerRunner(
val exitCode = when (compilationMode) {
is CompilationMode.Incremental -> {
compileIncrementally(args, caches, javaFilesProcessor, allKotlinSources, targetId, compilationMode, messageCollector)
compileIncrementally(args, caches, javaFilesProcessor, allKotlinSources, compilationMode, messageCollector)
}
is CompilationMode.Rebuild -> {
rebuild()
@@ -254,7 +253,6 @@ class IncrementalJvmCompilerRunner(
caches: IncrementalJvmCachesManager,
javaFilesProcessor: ChangedJavaFilesProcessor,
allKotlinSources: List<File>,
targetId: TargetId,
compilationMode: CompilationMode,
messageCollector: MessageCollector
): ExitCode {
@@ -296,7 +294,7 @@ class IncrementalJvmCompilerRunner(
val text = allSourcesToCompile.joinToString(separator = System.getProperty("line.separator")) { it.canonicalPath }
dirtySourcesSinceLastTimeFile.writeText(text)
val compilerOutput = compileChanged(listOf(targetId), sourcesToCompile.toSet(), args, caches.jvmCache, lookupTracker, messageCollector)
val compilerOutput = compileChanged(sourcesToCompile.toSet(), args, caches.jvmCache, lookupTracker, messageCollector)
exitCode = compilerOutput.exitCode
val generatedFiles = compilerOutput.generatedFiles
anyClassesCompiled = anyClassesCompiled || generatedFiles.isNotEmpty() || removedKotlinSources.isNotEmpty()
@@ -320,9 +318,7 @@ class IncrementalJvmCompilerRunner(
allGeneratedFiles.addAll(generatedFiles)
caches.inputsCache.registerOutputForSourceFiles(generatedFiles)
val compilationResult = updateIncrementalCaches(listOf(targetId), generatedFiles,
compiledWithErrors = exitCode != ExitCode.OK,
getIncrementalCache = { caches.jvmCache })
val compilationResult = updateIncrementalCache(generatedFiles, caches.jvmCache, compiledWithErrors = exitCode != ExitCode.OK)
caches.lookupCache.update(lookupTracker, sourcesToCompile, removedKotlinSources)
@@ -365,7 +361,7 @@ class IncrementalJvmCompilerRunner(
}
private fun additionalDirtyFiles(
cache: IncrementalCacheImpl<TargetId>,
cache: IncrementalCacheImpl,
generatedFiles: List<GeneratedFile<TargetId>>
): Collection<File> {
val result = HashSet<File>()
@@ -403,10 +399,9 @@ class IncrementalJvmCompilerRunner(
}
private fun compileChanged(
targets: List<TargetId>,
sourcesToCompile: Set<File>,
args: K2JVMCompilerArguments,
cache: IncrementalCacheImpl<TargetId>,
cache: IncrementalCacheImpl,
lookupTracker: LookupTracker,
messageCollector: MessageCollector
): CompileChangedResults {
@@ -429,7 +424,8 @@ class IncrementalJvmCompilerRunner(
val messageCollector = MessageCollectorWrapper(messageCollector, outputItemCollector)
try {
val incrementalCaches = makeIncrementalCachesMap(targets, { listOf<TargetId>() }, { cache }, { this })
val targetId = TargetId(args.moduleName, "java-production")
val incrementalCaches = mapOf(targetId to cache)
val compilationCanceledStatus = object : CompilationCanceledStatus {
override fun checkCanceled() {
}
@@ -439,7 +435,14 @@ class IncrementalJvmCompilerRunner(
reporter.report { "compiling with classpath: ${classpath.toList().sorted().joinToString()}" }
val compileServices = makeCompileServices(incrementalCaches, lookupTracker, compilationCanceledStatus)
val exitCode = compiler.exec(messageCollector, compileServices, args)
val generatedFiles = outputItemCollector.generatedFiles(targets, targets.first(), {sourcesToCompile}, {outputDir})
val generatedFiles = outputItemCollector.outputs.map {
val outputItem = it.outputFile
val sourceFiles = it.sourceFiles
when (outputItem.extension) {
"class" -> GeneratedJvmClass(targetId, sourceFiles, outputItem)
else -> GeneratedFile(targetId, sourceFiles, outputItem)
}
}
reporter.reportCompileIteration(sourcesToCompile, exitCode)
return CompileChangedResults(exitCode, generatedFiles)
}