Skip to content

Commit e454a4f

Browse files
udalovSpace Team
authored andcommitted
CLI: minor, simplify K1 entrypoint used only from tests
1 parent 5aa1d8f commit e454a4f

File tree

3 files changed

+6
-17
lines changed

3 files changed

+6
-17
lines changed

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoot
2121
import org.jetbrains.kotlin.cli.common.fir.FirDiagnosticsCompilerResultsReporter
2222
import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
2323
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
24+
import org.jetbrains.kotlin.cli.common.modules.ModuleBuilder
2425
import org.jetbrains.kotlin.cli.common.perfManager
2526
import org.jetbrains.kotlin.cli.jvm.config.*
2627
import org.jetbrains.kotlin.cli.jvm.config.ClassicFrontendSpecificJvmConfigurationKeys.JAVA_CLASSES_TRACKER
@@ -199,19 +200,8 @@ object KotlinToJVMBytecodeCompiler {
199200
)
200201

201202
fun compileBunchOfSources(environment: KotlinCoreEnvironment): Boolean {
202-
val moduleVisibilityManager = ModuleVisibilityManager.SERVICE.getInstance(environment.project)
203-
204-
val friendPaths = environment.configuration.getList(JVMConfigurationKeys.FRIEND_PATHS)
205-
for (path in friendPaths) {
206-
moduleVisibilityManager.addFriendPath(path)
207-
}
208-
209-
if (!checkKotlinPackageUsageForPsi(environment.configuration, environment.getSourceFiles())) return false
210-
211-
val generationState = analyzeAndGenerate(environment) ?: return false
212-
213-
writeOutput(environment.configuration, generationState.factory, null)
214-
return true
203+
val module = ModuleBuilder("test", environment.configuration.outputDirectory!!.path, "test")
204+
return compileModules(environment, buildFile = null, listOf(module))
215205
}
216206

217207
private fun repeatAnalysisIfNeeded(result: AnalysisResult?, environment: KotlinCoreEnvironment): AnalysisResult? {
@@ -253,7 +243,7 @@ object KotlinToJVMBytecodeCompiler {
253243
return result
254244
}
255245

256-
@Suppress("MemberVisibilityCanBePrivate") // Used in ExecuteKotlinScriptMojo
246+
@Suppress("unused") // Used in ExecuteKotlinScriptMojo. To be removed (KT-71729).
257247
fun analyzeAndGenerate(environment: KotlinCoreEnvironment): GenerationState? {
258248
val result = environment.configuration.perfManager.let {
259249
it?.notifyPhaseFinished(PhaseType.Initialization)

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/cliCompilerUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fun getBuildFilePaths(buildFile: File?, sourceFilePaths: List<String>): List<Str
6868
(File(path).takeIf(File::isAbsolute) ?: buildFile.resolveSibling(path)).absolutePath
6969
}
7070

71-
fun writeOutput(
71+
private fun writeOutput(
7272
configuration: CompilerConfiguration,
7373
outputFiles: OutputFileCollection,
7474
mainClassFqName: FqName?

compiler/tests-integration/tests/org/jetbrains/kotlin/integration/ColorsTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ class ColorsTest : TestCaseWithTmpdir() {
6161

6262
val environment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
6363

64-
// Compilation should return false, because there's one error.
65-
assertFalse(KotlinToJVMBytecodeCompiler.compileBunchOfSources(environment))
64+
KotlinToJVMBytecodeCompiler.compileBunchOfSources(environment)
6665

6766
val firstBytes = log.toByteArray().take(7)
6867
val logStartsWithColors = firstBytes.joinToString(" ") { it.toString(16) } == "1b 5b 31 3b 33 31 6d"

0 commit comments

Comments
 (0)