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

[IC] Rename DummyCompilationTransaction -> NonRecoverableCompilationTransaction

Browse Source
This commit is contained in:
Alexander.Likhachev
2023-01-26 20:27:26 +01:00
committed by Space Team
parent 25a3dcf3d1
commit 493da2a8b4
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/src/org/jetbrains/kotlin/incremental/CompilationTransaction.kt
+2 -2
View File
@@ -82,9 +82,9 @@ inline fun <R> CompilationTransaction.runWithin(
} }
/** /**
* A dummy implementation of compilation transaction * A non-recoverable implementation of compilation transaction. Changes reverting on failure should be performed externally if needed.
*/ */
class DummyCompilationTransaction : CompilationTransaction { class NonRecoverableCompilationTransaction : CompilationTransaction {
override fun registerAddedOrChangedFile(outputFile: Path) { override fun registerAddedOrChangedFile(outputFile: Path) {
// do nothing // do nothing
} }
build-common/src/org/jetbrains/kotlin/incremental/IncrementalCompilationContext.kt
+2 -2
View File
@@ -16,7 +16,7 @@ private fun createDefaultPathConverter(rootProjectDir: File?) = IncrementalFileT
class IncrementalCompilationContext( class IncrementalCompilationContext(
val pathConverter: FileToPathConverter, val pathConverter: FileToPathConverter,
val storeFullFqNamesInLookupCache: Boolean = false, val storeFullFqNamesInLookupCache: Boolean = false,
val transaction: CompilationTransaction = DummyCompilationTransaction(), val transaction: CompilationTransaction = NonRecoverableCompilationTransaction(),
val reporter: ICReporter = DoNothingICReporter, val reporter: ICReporter = DoNothingICReporter,
/** /**
* Controls whether changes in lookup cache should be tracked. Required for the classpath snapshots based IC approach * Controls whether changes in lookup cache should be tracked. Required for the classpath snapshots based IC approach
@@ -32,7 +32,7 @@ class IncrementalCompilationContext(
constructor( constructor(
rootProjectDir: File?, rootProjectDir: File?,
storeFullFqNamesInLookupCache: Boolean = false, storeFullFqNamesInLookupCache: Boolean = false,
transaction: CompilationTransaction = DummyCompilationTransaction(), transaction: CompilationTransaction = NonRecoverableCompilationTransaction(),
reporter: ICReporter = DoNothingICReporter, reporter: ICReporter = DoNothingICReporter,
trackChangesInLookupCache: Boolean = false, trackChangesInLookupCache: Boolean = false,
keepIncrementalCompilationCachesInMemory: Boolean = false, keepIncrementalCompilationCachesInMemory: Boolean = false,
build-common/test/org/jetbrains/kotlin/incremental/CompilationTransactionTest.kt
+2 -2
View File
@@ -33,8 +33,8 @@ abstract class BaseCompilationTransactionTest {
} }
} }
class DummyCompilationTransactionTest : BaseCompilationTransactionTest() { class NonRecoverableCompilationTransactionTest : BaseCompilationTransactionTest() {
override fun createTransaction() = DummyCompilationTransaction() override fun createTransaction() = NonRecoverableCompilationTransaction()
@Test @Test
fun testModifyingExistingFileOnSuccess() { fun testModifyingExistingFileOnSuccess() {
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt
+2 -2
View File
@@ -268,7 +268,7 @@ abstract class IncrementalCompilerRunner<
reporter.debug { "Cleaning ${outputDirsToClean.size} output directories" } reporter.debug { "Cleaning ${outputDirsToClean.size} output directories" }
cleanOrCreateDirectories(outputDirsToClean) cleanOrCreateDirectories(outputDirsToClean)
} }
val icContext = createIncrementalCompilationContext(projectDir, DummyCompilationTransaction()) val icContext = createIncrementalCompilationContext(projectDir, NonRecoverableCompilationTransaction())
return createCacheManager(icContext, args).use { caches -> return createCacheManager(icContext, args).use { caches ->
if (trackChangedFiles) { if (trackChangedFiles) {
caches.inputsCache.sourceSnapshotMap.compareAndUpdate(allSourceFiles) caches.inputsCache.sourceSnapshotMap.compareAndUpdate(allSourceFiles)
@@ -405,7 +405,7 @@ abstract class IncrementalCompilerRunner<
private fun createTransaction() = if (preciseCompilationResultsBackup) { private fun createTransaction() = if (preciseCompilationResultsBackup) {
RecoverableCompilationTransaction(reporter, Files.createTempDirectory("kotlin-backups")) RecoverableCompilationTransaction(reporter, Files.createTempDirectory("kotlin-backups"))
} else { } else {
DummyCompilationTransaction() NonRecoverableCompilationTransaction()
} }
protected open fun performWorkBeforeCompilation(compilationMode: CompilationMode, args: Args) {} protected open fun performWorkBeforeCompilation(compilationMode: CompilationMode, args: Args) {}
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt
-2
View File
@@ -13,9 +13,7 @@ import org.jetbrains.jps.incremental.fs.CompilationRound
import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.BuildMessage
import org.jetbrains.jps.incremental.messages.CompilerMessage import org.jetbrains.jps.incremental.messages.CompilerMessage
import org.jetbrains.kotlin.build.joinToReadableString import org.jetbrains.kotlin.build.joinToReadableString
import org.jetbrains.kotlin.build.report.DoNothingICReporter
import org.jetbrains.kotlin.config.CompilerRunnerConstants.KOTLIN_COMPILER_NAME import org.jetbrains.kotlin.config.CompilerRunnerConstants.KOTLIN_COMPILER_NAME
import org.jetbrains.kotlin.incremental.DummyCompilationTransaction
import org.jetbrains.kotlin.incremental.IncrementalCompilationContext import org.jetbrains.kotlin.incremental.IncrementalCompilationContext
import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.incremental.LookupSymbol
import org.jetbrains.kotlin.incremental.storage.FileToPathConverter import org.jetbrains.kotlin.incremental.storage.FileToPathConverter