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

Kotlin builder: avoid initialization of incremental caches in 'close' method (KT-6409)

Browse Source
This commit is contained in:
nik
2014-12-12 21:32:42 +03:00
committed by Evgeny Gerashchenko
parent f1d89805f1
commit 07a1ba0ef6
3 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt
+3 -8
View File
@@ -40,8 +40,6 @@ import org.jetbrains.jps.incremental.java.JavaBuilder
import org.jetbrains.jps.incremental.messages.BuildMessage
import org.jetbrains.jps.incremental.messages.CompilerMessage
import java.io.File
import java.io.IOException
import java.lang.reflect.Modifier
import java.util.*
import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION
import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.*
@@ -51,14 +49,11 @@ import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler
import org.jetbrains.jet.utils.keysToMap
import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.*
import com.intellij.openapi.diagnostic.Logger
import org.jetbrains.jet.lang.resolve.java.JvmAbi
import org.jetbrains.org.objectweb.asm.ClassReader
import org.jetbrains.jps.builders.java.JavaBuilderUtil
import com.intellij.util.containers.MultiMap
import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.jet.compiler.CompilerSettings
import org.jetbrains.jps.model.JpsProject
import org.jetbrains.jet.compiler.runner.OutputItemsCollector
import org.jetbrains.jet.compiler.runner.SimpleOutputItem
import org.jetbrains.jet.utils.LibraryUtils
@@ -92,10 +87,9 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
}
val dataManager = context.getProjectDescriptor().dataManager
val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getStorage(it, IncrementalCacheStorageProvider) }
if (incrementalCaches.values().any { it -> it.isCacheVersionIncompatible() }) {
incrementalCaches.values().forEach { it.clean() }
if (chunk.getTargets().any { CacheFormatVersion(File(dataManager.getDataPaths().getTargetDataRoot(it), IncrementalCacheImpl.DIRECTORY_NAME)).isIncompatible() }) {
chunk.getTargets().forEach { dataManager.getStorage(it, IncrementalCacheStorageProvider).clean() }
return CHUNK_REBUILD_REQUIRED
}
@@ -106,6 +100,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION)
val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getStorage(it, IncrementalCacheStorageProvider) }
val environment = createCompileEnvironment(incrementalCaches)
if (!environment.success()) {
environment.reportErrorsTo(messageCollector)
jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
+44 -38
View File
@@ -24,7 +24,6 @@ import com.intellij.util.io.IOUtil
import java.io.DataInput
import org.jetbrains.jet.lang.resolve.name.FqName
import com.intellij.util.io.DataExternalizer
import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader
import org.jetbrains.jet.descriptors.serialization.BitEncoding
import java.util.Arrays
import org.jetbrains.org.objectweb.asm.*
@@ -40,14 +39,48 @@ import java.security.MessageDigest
import org.jetbrains.jps.incremental.storage.StorageOwner
import org.jetbrains.jps.builders.storage.StorageProvider
import java.io.IOException
import java.util.Scanner
import org.jetbrains.jet.lang.resolve.java.JvmAbi
import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatiblePackageFacadeKind
import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind
import kotlin.properties.Delegates
val INLINE_ANNOTATION_DESC = "Lkotlin/inline;"
public class CacheFormatVersion(val baseDir: File) {
class object {
// Change this when incremental cache format changes
private val INCREMENTAL_CACHE_OWN_VERSION = 1
val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION
val FORMAT_VERSION_TXT: String = "format-version.txt"
}
private fun getFile(): File {
return File(baseDir, "format-version.txt")
}
public fun isIncompatible(): Boolean {
val version = load()
return version != -1 && version != CACHE_FORMAT_VERSION
}
private fun load(): Int {
val versionFile = getFile()
if (!versionFile.exists()) return -1
return versionFile.readText().toInt()
}
fun saveIfNeeded() {
val versionFile = getFile()
if (!versionFile.exists()) {
versionFile.writeText(CACHE_FORMAT_VERSION.toString())
}
}
fun clean() {
getFile().delete()
}
}
public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalCache {
class object {
val DIRECTORY_NAME = "kotlin"
@@ -56,48 +89,21 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC
val CONSTANTS_MAP = "constants.tab"
val INLINE_FUNCTIONS = "inline-functions.tab"
val PACKAGE_PARTS = "package-parts.tab"
// Change this when incremental cache format changes
private val INCREMENTAL_CACHE_OWN_VERSION = 1
public val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION
val FORMAT_VERSION_TXT = "format-version.txt"
}
private val protoMap by Delegates.lazy { ProtoMap() }
private val constantsMap by Delegates.lazy { ConstantsMap() }
private val inlineFunctionsMap by Delegates.lazy { InlineFunctionsMap() }
private val packagePartMap by Delegates.lazy { PackagePartMap() }
private val protoMap = ProtoMap()
private val constantsMap = ConstantsMap()
private val inlineFunctionsMap = InlineFunctionsMap()
private val packagePartMap = PackagePartMap()
private val maps by Delegates.lazy { listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) }
private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap)
private fun getFormatVersionFile(): File {
return File(baseDir, FORMAT_VERSION_TXT)
}
public fun isCacheVersionIncompatible(): Boolean {
val version = loadCacheFormatVersion()
return version != -1 && version != CACHE_FORMAT_VERSION
}
private fun loadCacheFormatVersion(): Int {
val versionFile = getFormatVersionFile()
if (!versionFile.exists()) return -1
return versionFile.readText().toInt()
}
private fun saveCacheFormatVersionIfNeeded() {
val versionFile = getFormatVersionFile()
if (!versionFile.exists()) {
versionFile.writeText(CACHE_FORMAT_VERSION.toString())
}
}
private val cacheFormatVersion = CacheFormatVersion(baseDir)
public fun saveFileToCache(sourceFiles: Collection<File>, classFile: File): RecompilationDecision {
if (classFile.extension.toLowerCase() != "class") return DO_NOTHING
saveCacheFormatVersionIfNeeded()
cacheFormatVersion.saveIfNeeded()
val kotlinClass = LocalFileKotlinClass.create(classFile)
if (kotlinClass == null) return DO_NOTHING
@@ -160,7 +166,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC
public override fun clean() {
maps.forEach { it.clean() }
getFormatVersionFile().delete()
cacheFormatVersion.clean()
}
public override fun close() {
jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt
+2 -1
View File
@@ -21,6 +21,7 @@ import java.io.File
import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType
import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl
import kotlin.test.assertTrue
import org.jetbrains.jet.jps.incremental.CacheFormatVersion
public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() {
fun testCacheVersionChanged() {
@@ -36,7 +37,7 @@ public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() {
override fun performAdditionalModifications() {
val storageForTargetType = BuildDataPathsImpl(myDataStorageRoot).getTargetTypeDataRoot(JavaModuleBuildTargetType.PRODUCTION)
val relativePath = "module/${File.separator}${IncrementalCacheImpl.DIRECTORY_NAME}/${IncrementalCacheImpl.FORMAT_VERSION_TXT}"
val relativePath = "module/${File.separator}${IncrementalCacheImpl.DIRECTORY_NAME}/${CacheFormatVersion.FORMAT_VERSION_TXT}"
val cacheVersionFile = File(storageForTargetType, relativePath)
assertTrue(cacheVersionFile.exists())