From 2bd7d12312d4d3535bce826d6da4831186e6a769 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 26 Apr 2017 13:57:22 +0300 Subject: [PATCH] Remove old IC: remove IncrementalCompilation.isExperimental --- .../jetbrains/kotlin/incremental/CacheVersion.kt | 4 ++-- .../kotlin/incremental/IncrementalCacheImpl.kt | 14 +++++++------- .../org/jetbrains/kotlin/incremental/buildUtil.kt | 2 +- .../incremental/IncrementalJvmCompilerRunner.kt | 4 ---- .../jetbrains/kotlin/incremental/cacheVersions.kt | 2 +- .../kotlin/config/IncrementalCompilation.java | 10 ---------- .../KotlinBuildProcessParametersProvider.kt | 2 +- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 8 ++------ .../jps/build/AbstractIncrementalLazyCachesTest.kt | 2 +- .../experimentalIncrementalCompilationTests.kt | 7 +------ .../kotlin/jps/build/incrementalCustomTests.kt | 1 - .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 5 +---- .../jps/incremental/JpsIncrementalCacheImpl.kt | 2 +- .../org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 1 - 14 files changed, 18 insertions(+), 46 deletions(-) diff --git a/build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt b/build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt index 7a6d9b4c64d..73d93a240f7 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt @@ -112,7 +112,7 @@ fun experimentalCacheVersion(dataRoot: File): CacheVersion = whenVersionChanged = CacheVersion.Action.REBUILD_CHUNK, whenTurnedOn = CacheVersion.Action.REBUILD_CHUNK, whenTurnedOff = CacheVersion.Action.CLEAN_EXPERIMENTAL_CACHES, - isEnabled = { IncrementalCompilation.isExperimental() }) + isEnabled = { IncrementalCompilation.isEnabled() }) fun dataContainerCacheVersion(dataRoot: File): CacheVersion = CacheVersion(ownVersion = DATA_CONTAINER_VERSION, @@ -120,4 +120,4 @@ fun dataContainerCacheVersion(dataRoot: File): CacheVersion = whenVersionChanged = CacheVersion.Action.REBUILD_ALL_KOTLIN, whenTurnedOn = CacheVersion.Action.REBUILD_ALL_KOTLIN, whenTurnedOff = CacheVersion.Action.CLEAN_DATA_CONTAINER, - isEnabled = { IncrementalCompilation.isExperimental() }) + isEnabled = { IncrementalCompilation.isEnabled() }) diff --git a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt index 800b41b613c..c59282c9ba1 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt @@ -165,7 +165,7 @@ open class IncrementalCacheImpl( sourceToClassesMap.add(it, className) } - if (IncrementalCompilation.isExperimental()) { + if (IncrementalCompilation.isEnabled()) { internalNameToSource[className.internalName] = sourceFiles } @@ -290,7 +290,7 @@ open class IncrementalCacheImpl( .toList() val changes = - if (IncrementalCompilation.isExperimental()) + if (IncrementalCompilation.isEnabled()) dirtyClasses.flatMap { computeChanges(it, ::Removed) }.asSequence() else emptySequence() @@ -416,7 +416,7 @@ open class IncrementalCacheImpl( if (oldData == null) { val changes = - if (IncrementalCompilation.isExperimental()) + if (IncrementalCompilation.isEnabled()) computeChanges(className, ::MembersChanged).asSequence() else emptySequence() @@ -492,7 +492,7 @@ open class IncrementalCacheImpl( } val changes = - if (!IncrementalCompilation.isExperimental() || + if (!IncrementalCompilation.isEnabled() || constantsMap == null || constantsMap.isEmpty() || oldMap == null || oldMap.isEmpty() ) { @@ -617,7 +617,7 @@ open class IncrementalCacheImpl( } private fun addToClassStorage(kotlinClass: LocalFileKotlinClass, srcFile: File) { - if (!IncrementalCompilation.isExperimental()) return + if (!IncrementalCompilation.isEnabled()) return val classData = JvmProtoBufUtil.readClassDataFrom(kotlinClass.classHeader.data!!, kotlinClass.classHeader.strings!!) val supertypes = classData.classProto.supertypes(TypeTable(classData.classProto.typeTable)) @@ -636,7 +636,7 @@ open class IncrementalCacheImpl( } private fun removeAllFromClassStorage(removedClasses: Collection) { - if (!IncrementalCompilation.isExperimental() || removedClasses.isEmpty()) return + if (!IncrementalCompilation.isEnabled() || removedClasses.isEmpty()) return val removedFqNames = removedClasses.map { it.fqNameForClassNameWithoutDollars }.toSet() @@ -738,7 +738,7 @@ open class IncrementalCacheImpl( } val changes = - if (IncrementalCompilation.isExperimental()) { + if (IncrementalCompilation.isEnabled()) { val fqName = if (isPackage) className.packageFqName else className.fqNameForClassNameWithoutDollars // TODO get name in better way instead of using substringBefore (added.asSequence() + changed.asSequence()).map { ChangeInfo.MembersChanged(fqName, listOf(it.substringBefore("("))) } diff --git a/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt b/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt index a81067d772e..6a7fd4c3ea4 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt @@ -79,7 +79,7 @@ fun makeCompileServices( } fun makeLookupTracker(parentLookupTracker: LookupTracker = LookupTracker.DO_NOTHING): LookupTracker = - if (IncrementalCompilation.isExperimental()) LookupTrackerImpl(parentLookupTracker) + if (IncrementalCompilation.isEnabled()) LookupTrackerImpl(parentLookupTracker) else parentLookupTracker fun makeIncrementalCachesMap( 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 ead150f6f0b..cb90530e439 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 @@ -73,16 +73,13 @@ private object EmptyICReporter : ICReporter { inline fun withIC(fn: ()->R): R { val isEnabledBackup = IncrementalCompilation.isEnabled() - val isExperimentalBackup = IncrementalCompilation.isExperimental() IncrementalCompilation.setIsEnabled(true) - IncrementalCompilation.setIsExperimental(true) try { return fn() } finally { IncrementalCompilation.setIsEnabled(isEnabledBackup) - IncrementalCompilation.setIsExperimental(isExperimentalBackup) } } @@ -259,7 +256,6 @@ class IncrementalJvmCompilerRunner( messageCollector: MessageCollector ): ExitCode { assert(IncrementalCompilation.isEnabled()) { "Incremental compilation is not enabled" } - assert(IncrementalCompilation.isExperimental()) { "Experimental incremental compilation is not enabled" } val allGeneratedFiles = hashSetOf>() val dirtySources: MutableList diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/cacheVersions.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/cacheVersions.kt index 3c8c6b33312..6b14b1c3a8c 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/cacheVersions.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/cacheVersions.kt @@ -31,7 +31,7 @@ fun customCacheVersion(version: Int, fileName: String, dataRoot: File, forceEnab whenVersionChanged = CacheVersion.Action.REBUILD_ALL_KOTLIN, whenTurnedOn = CacheVersion.Action.REBUILD_ALL_KOTLIN, whenTurnedOff = CacheVersion.Action.REBUILD_ALL_KOTLIN, - isEnabled = { IncrementalCompilation.isExperimental() || forceEnable }) + isEnabled = { IncrementalCompilation.isEnabled() || forceEnable }) fun commonCacheVersions(cachesDir: File): List = listOf(normalCacheVersion(cachesDir), diff --git a/compiler/util/src/org/jetbrains/kotlin/config/IncrementalCompilation.java b/compiler/util/src/org/jetbrains/kotlin/config/IncrementalCompilation.java index fd93eeac0c0..e2b979e3543 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/IncrementalCompilation.java +++ b/compiler/util/src/org/jetbrains/kotlin/config/IncrementalCompilation.java @@ -20,11 +20,6 @@ import org.jetbrains.annotations.TestOnly; public class IncrementalCompilation { private static final String INCREMENTAL_COMPILATION_PROPERTY = "kotlin.incremental.compilation"; - private static final String IS_EXPERIMENTAL_PROPERTY = "kotlin.incremental.compilation.experimental"; - - public static boolean isExperimental() { - return isEnabled() && "true".equals(System.getProperty(IS_EXPERIMENTAL_PROPERTY)); - } public static boolean isEnabled() { return !"false".equals(System.getProperty(INCREMENTAL_COMPILATION_PROPERTY)); @@ -34,9 +29,4 @@ public class IncrementalCompilation { public static void setIsEnabled(boolean value) { System.setProperty(INCREMENTAL_COMPILATION_PROPERTY, String.valueOf(value)); } - - @TestOnly - public static void setIsExperimental(boolean value) { - System.setProperty(IS_EXPERIMENTAL_PROPERTY, String.valueOf(value)); - } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt index 269cae00518..188bea40f12 100644 --- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt @@ -25,7 +25,7 @@ class KotlinBuildProcessParametersProvider(private val compilerWorkspaceSettings override fun getVMArguments(): MutableList { val res = arrayListOf() if (compilerWorkspaceSettings.preciseIncrementalEnabled) { - res.add("-Dkotlin.incremental.compilation.experimental=true") + res.add("-Dkotlin.incremental.compilation=true") } if (compilerWorkspaceSettings.enableDaemon) { res.add("-Dkotlin.daemon.enabled") diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 295fb525744..eee914ebc4d 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -71,8 +71,6 @@ abstract class AbstractIncrementalJpsTest( private val DEBUG_LOGGING_ENABLED = System.getProperty("debug.logging.enabled") == "true" } - protected open val enableExperimentalIncrementalCompilation = false - protected lateinit var testDataDir: File protected lateinit var workDir: File protected lateinit var projectDescriptor: ProjectDescriptor @@ -81,7 +79,7 @@ abstract class AbstractIncrementalJpsTest( protected var mapWorkingToOriginalFile: MutableMap = hashMapOf() protected open val buildLogFinder: BuildLogFinder - get() = BuildLogFinder(isExperimentalEnabled = enableExperimentalIncrementalCompilation) + get() = BuildLogFinder(isExperimentalEnabled = true) private fun enableDebugLogging() { com.intellij.openapi.diagnostic.Logger.setFactory(TestLoggerFactory::class.java) @@ -112,7 +110,7 @@ abstract class AbstractIncrementalJpsTest( override fun setUp() { super.setUp() lookupsDuringTest = hashSetOf() - IncrementalCompilation.setIsExperimental(enableExperimentalIncrementalCompilation) + IncrementalCompilation.setIsEnabled(true) if (DEBUG_LOGGING_ENABLED) { enableDebugLogging() @@ -279,8 +277,6 @@ abstract class AbstractIncrementalJpsTest( throw IllegalStateException("No build log file in $testDataDir") } - if (!enableExperimentalIncrementalCompilation && File(testDataDir, "dont-check-caches-in-non-experimental-ic.txt").exists()) return - val lastMakeResult = otherMakeResults.last() rebuildAndCheckOutput(lastMakeResult) clearCachesRebuildAndCheckOutput(lastMakeResult) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index ea36a1d0d36..573e77ff7d9 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -55,7 +55,7 @@ abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() IncrementalCompilation.setIsEnabled(modification.dataFile.readAsBool()) } name.endsWith("experimental-compilation") -> { - IncrementalCompilation.setIsExperimental(modification.dataFile.readAsBool()) + IncrementalCompilation.setIsEnabled(modification.dataFile.readAsBool()) } } } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt index 8841eaceb01..b15fb2daad9 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt @@ -20,12 +20,9 @@ import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider -abstract class AbstractExperimentalIncrementalJpsTest : AbstractIncrementalJpsTest() { - override val enableExperimentalIncrementalCompilation = true -} +abstract class AbstractExperimentalIncrementalJpsTest : AbstractIncrementalJpsTest() abstract class AbstractExperimentalIncrementalLazyCachesTest : AbstractIncrementalLazyCachesTest() { - override val enableExperimentalIncrementalCompilation = true override val expectedCachesFileName: String get() = "experimental-expected-kotlin-caches.txt" @@ -34,8 +31,6 @@ abstract class AbstractExperimentalIncrementalLazyCachesTest : AbstractIncrement abstract class AbstractExperimentalChangeIncrementalOptionTest : AbstractIncrementalLazyCachesTest() abstract class AbstractExperimentalIncrementalCacheVersionChangedTest : AbstractIncrementalCacheVersionChangedTest() { - override val enableExperimentalIncrementalCompilation = true - override fun getVersions(cacheVersionProvider: CacheVersionProvider, targets: Iterable) = targets.map { cacheVersionProvider.experimentalVersion(it) } } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt index 42a8c9a497c..9047cbfe8ae 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt @@ -29,5 +29,4 @@ open class IncrementalRenameModuleTest : AbstractIncrementalJpsTest() { } class ExperimentalIncrementalRenameModuleTest : IncrementalRenameModuleTest() { - override val enableExperimentalIncrementalCompilation = true } diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index c4ccecf8fc6..c9879c12a80 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -92,7 +92,6 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { override fun buildStarted(context: CompileContext) { LOG.debug("==========================================") LOG.info("is Kotlin incremental compilation enabled: ${IncrementalCompilation.isEnabled()}") - LOG.info("is Kotlin experimental incremental compilation enabled: ${IncrementalCompilation.isExperimental()}") LOG.info("is Kotlin compiler daemon enabled: ${isDaemonEnabled()}") val historyLabel = context.getBuilderParameter("history label") @@ -643,8 +642,6 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { dirtyFilesHolder: DirtyFilesHolder, filesToCompile: MultiMap ) { - if (!IncrementalCompilation.isExperimental()) return - if (lookupTracker !is LookupTrackerImpl) throw AssertionError("Lookup tracker is expected to be LookupTrackerImpl, got ${lookupTracker::class.java}") val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider) @@ -845,7 +842,7 @@ private fun CompilationResult.processChangesUsingLookups( private fun getLookupTracker(project: JpsProject): LookupTracker { val testLookupTracker = project.testingContext?.lookupTracker ?: LookupTracker.DO_NOTHING - if (IncrementalCompilation.isExperimental()) return LookupTrackerImpl(testLookupTracker) + if (IncrementalCompilation.isEnabled()) return LookupTrackerImpl(testLookupTracker) return testLookupTracker } diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt index 409c1f35141..4e5a7762685 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt @@ -45,7 +45,7 @@ class JpsIncrementalCacheImpl( private val inlinedTo = registerMap(InlineFunctionsFilesMap(INLINED_TO.storageFile)) override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { - if (!IncrementalCompilation.isExperimental()) { + if (!IncrementalCompilation.isEnabled()) { inlinedTo.add(fromPath, jvmSignature, toPath) } } 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 df15a81cdf9..dc71141d64f 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 @@ -94,7 +94,6 @@ abstract class AbstractKotlinCompile() : AbstractKo field = value logger.kotlinDebug { "Set $this.incremental=$value" } System.setProperty("kotlin.incremental.compilation", value.toString()) - System.setProperty("kotlin.incremental.compilation.experimental", value.toString()) } private lateinit var destinationDirProvider: Lazy