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

[CLI] Store information about HMPP module for source files

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2023-02-09 17:48:11 +02:00
committed by Space Team
parent 77caa31640
commit d4bb740a62
16 changed files with 68 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/common/config/ContentRoots.kt
+3 -3
View File
@@ -13,11 +13,11 @@ interface ContentRoot
/**
* @param isCommon whether this source root contains sources of a common module in a multi-platform project
*/
data class KotlinSourceRoot(val path: String, val isCommon: Boolean): ContentRoot
data class KotlinSourceRoot(val path: String, val isCommon: Boolean, val hmppModuleName: String?): ContentRoot
@JvmOverloads
fun CompilerConfiguration.addKotlinSourceRoot(path: String, isCommon: Boolean = false) {
add(CLIConfigurationKeys.CONTENT_ROOTS, KotlinSourceRoot(path, isCommon))
fun CompilerConfiguration.addKotlinSourceRoot(path: String, isCommon: Boolean = false, hmppModuleName: String? = null) {
add(CLIConfigurationKeys.CONTENT_ROOTS, KotlinSourceRoot(path, isCommon, hmppModuleName))
}
fun CompilerConfiguration.addKotlinSourceRoots(sources: List<String>): Unit =
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+1 -1
View File
@@ -292,7 +292,7 @@ class KotlinCoreEnvironment private constructor(
}
fun addKotlinSourceRoots(rootDirs: List<File>) {
val roots = rootDirs.map { KotlinSourceRoot(it.absolutePath, isCommon = false) }
val roots = rootDirs.map { KotlinSourceRoot(it.absolutePath, isCommon = false, hmppModuleName = null) }
sourceFiles += createSourceFilesFromSourceRoots(configuration, project, roots).toSet() - sourceFiles
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
+2 -1
View File
@@ -376,11 +376,12 @@ object KotlinToJVMBytecodeCompiler {
}
fun CompilerConfiguration.configureSourceRoots(chunk: List<Module>, buildFile: File? = null) {
val hmppCliModuleStructure = get(CommonConfigurationKeys.HMPP_MODULE_STRUCTURE)
for (module in chunk) {
val commonSources = getBuildFilePaths(buildFile, module.getCommonSourceFiles()).toSet()
for (path in getBuildFilePaths(buildFile, module.getSourceFiles())) {
addKotlinSourceRoot(path, isCommon = path in commonSources)
addKotlinSourceRoot(path, isCommon = path in commonSources, hmppCliModuleStructure?.getModuleNameForSource(path))
}
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreEnvironmentUtils.kt
+8 -5
View File
@@ -25,8 +25,8 @@ import org.jetbrains.kotlin.extensions.CompilerConfigurationExtension
import org.jetbrains.kotlin.extensions.PreprocessedFileCreator
import org.jetbrains.kotlin.idea.KotlinFileType
import org.jetbrains.kotlin.modules.Module
import org.jetbrains.kotlin.parsing.KotlinParserDefinition
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.multiplatform.hmppModuleName
import org.jetbrains.kotlin.resolve.multiplatform.isCommonSource
import java.io.File
@@ -38,7 +38,7 @@ inline fun List<KotlinSourceRoot>.forAllFiles(
configuration: CompilerConfiguration,
project: Project,
reportLocation: CompilerMessageLocation? = null,
body: (VirtualFile, Boolean) -> Unit
body: (VirtualFile, Boolean, moduleName: String?) -> Unit
) {
val localFileSystem = VirtualFileManager.getInstance()
.getFileSystem(StandardFileSystems.FILE_PROTOCOL)
@@ -49,7 +49,7 @@ inline fun List<KotlinSourceRoot>.forAllFiles(
var pluginsConfigured = false
for ((sourceRootPath, isCommon) in this) {
for ((sourceRootPath, isCommon, hmppModuleName) in this) {
val sourceRoot = File(sourceRootPath)
val vFile = localFileSystem.findFileByPath(sourceRoot.normalize().path)
if (vFile == null) {
@@ -85,7 +85,7 @@ inline fun List<KotlinSourceRoot>.forAllFiles(
virtualFile.registerPluginsSuppliedExtensionsIfNeeded(project)
pluginsConfigured = true
}
body(virtualFile, isCommon)
body(virtualFile, isCommon, hmppModuleName)
}
}
}
@@ -112,10 +112,13 @@ fun createSourceFilesFromSourceRoots(
): MutableList<KtFile> {
val psiManager = PsiManager.getInstance(project)
val result = mutableListOf<KtFile>()
sourceRoots.forAllFiles(configuration, project, reportLocation) { virtualFile, isCommon ->
sourceRoots.forAllFiles(configuration, project, reportLocation) { virtualFile, isCommon, moduleName ->
psiManager.findFile(virtualFile)?.let {
if (it is KtFile) {
it.isCommonSource = isCommon
if (moduleName != null) {
it.hmppModuleName = moduleName
}
result.add(it)
}
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt
+19 -4
View File
@@ -104,12 +104,13 @@ fun compileModulesUsingFrontendIrAndLightTree(
val moduleConfiguration = compilerConfiguration.copy().applyModuleProperties(module, buildFile).apply {
put(JVMConfigurationKeys.FRIEND_PATHS, module.getFriendPaths())
}
val (platformSources, commonSources) = collectSources(compilerConfiguration, projectEnvironment, messageCollector)
val (platformSources, commonSources, sourcesByModuleName) = collectSources(compilerConfiguration, projectEnvironment, messageCollector)
val compilerInput = ModuleCompilerInput(
TargetId(module),
CommonPlatforms.defaultCommonPlatform, commonSources,
JvmPlatforms.unspecifiedJvmPlatform, platformSources,
sourcesByModuleName,
moduleConfiguration
)
@@ -169,26 +170,40 @@ fun compileModulesUsingFrontendIrAndLightTree(
)
}
data class GroupedKtSources(
val platformSources: Set<KtSourceFile>,
val commonSources: Set<KtSourceFile>,
val sourcesByModuleName: Map<String, Set<KtSourceFile>>,
)
fun collectSources(
compilerConfiguration: CompilerConfiguration,
projectEnvironment: VfsBasedProjectEnvironment,
messageCollector: MessageCollector
): Pair<LinkedHashSet<KtSourceFile>, LinkedHashSet<KtSourceFile>> {
): GroupedKtSources {
val platformSources = linkedSetOf<KtSourceFile>()
val commonSources = linkedSetOf<KtSourceFile>()
val sourcesByModuleName = mutableMapOf<String, MutableSet<KtSourceFile>>()
// TODO: the scripts checking should be part of the scripting plugin functionality, as it is implemented now in ScriptingProcessSourcesBeforeCompilingExtension
// TODO: implement in the next round of K2 scripting support (https://youtrack.jetbrains.com/issue/KT-55728)
val skipScriptsInLtMode = compilerConfiguration.getBoolean(CommonConfigurationKeys.USE_FIR) && compilerConfiguration.getBoolean(CommonConfigurationKeys.USE_LIGHT_TREE)
var skipScriptsInLtModeWarning = false
compilerConfiguration.kotlinSourceRoots.forAllFiles(compilerConfiguration, projectEnvironment.project) { virtualFile, isCommon ->
compilerConfiguration.kotlinSourceRoots.forAllFiles(
compilerConfiguration,
projectEnvironment.project
) { virtualFile, isCommon, moduleName ->
val file = KtVirtualFileSourceFile(virtualFile)
when {
file.path.endsWith(javaFileExtensionWithDot) -> {}
file.path.endsWith(kotlinFileExtensionWithDot) || !skipScriptsInLtMode -> {
if (isCommon) commonSources.add(file)
else platformSources.add(file)
if (moduleName != null) {
sourcesByModuleName.getOrPut(moduleName) { mutableSetOf() }.add(file)
}
}
else -> {
// temporarily assume it is a script, see the TODO above
@@ -204,7 +219,7 @@ fun collectSources(
"Scripts are not yet supported with K2 in LightTree mode, consider using K1 or disable LightTree mode with -Xuse-fir-lt=false"
)
}
return Pair(platformSources, commonSources)
return GroupedKtSources(platformSources, commonSources, sourcesByModuleName)
}
fun convertAnalyzedFirToIr(
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipelineData.kt
+1
View File
@@ -26,6 +26,7 @@ data class ModuleCompilerInput(
val commonSources: Collection<KtSourceFile>,
val platform: TargetPlatform,
val platformSources: Collection<KtSourceFile>,
val sourcesByModule: Map<String, Collection<KtSourceFile>>,
val configuration: CompilerConfiguration,
val friendFirModules: Collection<FirModuleData> = emptyList()
)
compiler/cli/src/org/jetbrains/kotlin/cli/metadata/FirMetadataSerializer.kt
+1 -1
View File
@@ -71,7 +71,7 @@ internal class FirMetadataSerializer(
projectEnvironment = environment.toAbstractProjectEnvironment() as VfsBasedProjectEnvironment
librariesScope = projectEnvironment.getSearchScopeForProjectLibraries()
librariesHelperScope = projectEnvironment.getSearchScopeForProjectLibraries()
ltFiles = collectSources(configuration, projectEnvironment, messageCollector).let { it.first + it.second }.toList()
ltFiles = collectSources(configuration, projectEnvironment, messageCollector).let { it.commonSources + it.platformSources }.toList()
sourceScope = projectEnvironment.getSearchScopeBySourceFiles(ltFiles)
providerAndScopeForIncrementalCompilation = createContextForIncrementalCompilation(
configuration,
compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataCompiler.kt
+3 -1
View File
@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.codegen.CompilationException
import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.Services
import org.jetbrains.kotlin.config.getModuleNameForSource
import org.jetbrains.kotlin.metadata.builtins.BuiltInsBinaryVersion
import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
@@ -64,8 +65,9 @@ class K2MetadataCompiler : CLICompiler<K2MetadataCompilerArguments>() {
if (pluginLoadResult != ExitCode.OK) return pluginLoadResult
val commonSources = arguments.commonSources?.toSet() ?: emptySet()
val hmppCliModuleStructure = configuration.get(CommonConfigurationKeys.HMPP_MODULE_STRUCTURE)
for (arg in arguments.freeArgs) {
configuration.addKotlinSourceRoot(arg, isCommon = arg in commonSources)
configuration.addKotlinSourceRoot(arg, isCommon = arg in commonSources, hmppCliModuleStructure?.getModuleNameForSource(arg))
}
if (arguments.classpath != null) {
configuration.addJvmClasspathRoots(arguments.classpath!!.split(File.pathSeparatorChar).map(::File))