diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt index 0bc35a35e6d..20716e86443 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.incremental import org.jetbrains.kotlin.build.GeneratedFile import org.jetbrains.kotlin.build.report.BuildReporter +import org.jetbrains.kotlin.build.report.DoNothingICReporter import org.jetbrains.kotlin.build.report.ICReporter import org.jetbrains.kotlin.build.report.metrics.BuildAttribute import org.jetbrains.kotlin.build.report.metrics.DoNothingBuildMetricsReporter @@ -44,7 +45,7 @@ fun makeJsIncrementally( args: K2JSCompilerArguments, buildHistoryFile: File, messageCollector: MessageCollector = MessageCollector.NONE, - reporter: ICReporter = EmptyICReporter, + reporter: ICReporter = DoNothingICReporter, scopeExpansion: CompileScopeExpansionMode = CompileScopeExpansionMode.NEVER, modulesApiHistory: ModulesApiHistory = EmptyModulesApiHistory, providedChangedFiles: ChangedFiles? = null 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 0b1ebbde159..8c49b920126 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 @@ -27,8 +27,8 @@ import org.jetbrains.kotlin.build.DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS import org.jetbrains.kotlin.build.GeneratedFile import org.jetbrains.kotlin.build.GeneratedJvmClass import org.jetbrains.kotlin.build.report.BuildReporter +import org.jetbrains.kotlin.build.report.DoNothingICReporter import org.jetbrains.kotlin.build.report.ICReporter -import org.jetbrains.kotlin.build.report.ICReporterBase import org.jetbrains.kotlin.build.report.metrics.BuildAttribute import org.jetbrains.kotlin.build.report.metrics.BuildTime import org.jetbrains.kotlin.build.report.metrics.DoNothingBuildMetricsReporter @@ -77,7 +77,7 @@ fun makeIncrementally( sourceRoots: Iterable, args: K2JVMCompilerArguments, messageCollector: MessageCollector = MessageCollector.NONE, - reporter: ICReporter = EmptyICReporter + reporter: ICReporter = DoNothingICReporter ) { val kotlinExtensions = DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS val allExtensions = kotlinExtensions + "java" @@ -104,15 +104,6 @@ fun makeIncrementally( } } -object EmptyICReporter : ICReporterBase() { - override fun report(message: () -> String) {} - override fun reportVerbose(message: () -> String) {} - override fun reportCompileIteration(incremental: Boolean, sourceFiles: Collection, exitCode: ExitCode) {} - override fun reportMarkDirtyClass(affectedFiles: Iterable, classFqName: String) {} - override fun reportMarkDirtyMember(affectedFiles: Iterable, scope: String, name: String) {} - override fun reportMarkDirty(affectedFiles: Iterable, reason: String) {} -} - @Suppress("DEPRECATION") inline fun withIC(args: CommonCompilerArguments, enabled: Boolean = true, fn: () -> R): R { val isEnabledBackup = IncrementalCompilation.isEnabledForJvm() diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputer.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputer.kt index ba19b618135..bee66d7d204 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputer.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputer.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.incremental.classpathDiff import com.intellij.openapi.util.io.FileUtil +import org.jetbrains.kotlin.build.report.DoNothingICReporter import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporter import org.jetbrains.kotlin.build.report.metrics.BuildTime import org.jetbrains.kotlin.build.report.metrics.measure @@ -238,7 +239,7 @@ object ClasspathChangesComputer { incrementalJvmCache.clearCacheForRemovedClasses(changesCollector) // Normalize the changes and clean up - val dirtyData = changesCollector.getDirtyData(listOf(incrementalJvmCache), EmptyICReporter) + val dirtyData = changesCollector.getDirtyData(listOf(incrementalJvmCache), DoNothingICReporter) workingDir.deleteRecursively() return dirtyData.toProgramSymbols(currentClassSnapshots, previousClassSnapshots) diff --git a/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt b/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt index 6f415ada42c..984a063d1d1 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt @@ -18,8 +18,7 @@ import org.jetbrains.kotlin.backend.common.serialization.CompatibilityMode import org.jetbrains.kotlin.backend.common.serialization.KlibIrVersion import org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataVersion import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureDescriptor -import org.jetbrains.kotlin.build.report.BuildReporter -import org.jetbrains.kotlin.build.report.metrics.DoNothingBuildMetricsReporter +import org.jetbrains.kotlin.build.report.DoNothingBuildReporter import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles @@ -28,7 +27,6 @@ import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.descriptors.konan.kotlinLibrary import org.jetbrains.kotlin.incremental.ChangedFiles -import org.jetbrains.kotlin.incremental.EmptyICReporter import org.jetbrains.kotlin.incremental.IncrementalJsCompilerRunner import org.jetbrains.kotlin.incremental.multiproject.EmptyModulesApiHistory import org.jetbrains.kotlin.incremental.withJsIC @@ -322,7 +320,7 @@ class GenerateIrRuntime { withJsIC(args) { val buildHistoryFile = File(cachesDir, "build-history.bin") val compiler = IncrementalJsCompilerRunner( - cachesDir, BuildReporter(EmptyICReporter, DoNothingBuildMetricsReporter), + cachesDir, DoNothingBuildReporter, buildHistoryFile = buildHistoryFile, modulesApiHistory = EmptyModulesApiHistory ) @@ -366,7 +364,7 @@ class GenerateIrRuntime { withJsIC(args) { val buildHistoryFile = File(cachesDir, "build-history.bin") val compiler = IncrementalJsCompilerRunner( - cachesDir, BuildReporter(EmptyICReporter, DoNothingBuildMetricsReporter), + cachesDir, DoNothingBuildReporter, buildHistoryFile = buildHistoryFile, modulesApiHistory = EmptyModulesApiHistory )