Add compiler key to dump arguments
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt index 95e78c3..fa7f038 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt
@@ -337,6 +337,12 @@ ) var explicitApi: String by FreezableVar(ExplicitApiMode.DISABLED.state) + @Argument( + value = "-Xdump-model", + description = "Don't even try to use it" + ) + var dumpArgumentsDir: String? by FreezableVar(null) + open fun configureAnalysisFlags(collector: MessageCollector): MutableMap<AnalysisFlag<*>, Any> { return HashMap<AnalysisFlag<*>, Any>().apply { put(AnalysisFlags.skipMetadataVersionCheck, skipMetadataVersionCheck)
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt index 3ff8378..cc0e993 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt
@@ -24,6 +24,7 @@ put(CommonConfigurationKeys.DISABLE_INLINE, arguments.noInline) put(CommonConfigurationKeys.USE_FIR, arguments.useFir) put(CommonConfigurationKeys.KLIB_MPP, arguments.klibBasedMpp) + putIfNotNull(CommonConfigurationKeys.DUMP_MODEL, arguments.dumpArgumentsDir) putIfNotNull(CLIConfigurationKeys.INTELLIJ_PLUGIN_ROOT, arguments.intellijPluginRoot) put(CommonConfigurationKeys.REPORT_OUTPUT_FILES, arguments.reportOutputFiles)
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt index df7ca08..0b1bae2 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
@@ -23,6 +23,11 @@ import com.intellij.psi.PsiJavaModule import com.intellij.psi.search.DelegatingGlobalSearchScope import com.intellij.psi.search.GlobalSearchScope +import org.jdom.Attribute +import org.jdom.Document +import org.jdom.Element +import org.jdom.output.Format +import org.jdom.output.XMLOutputter import com.intellij.psi.search.ProjectScope import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.analyzer.ModuleInfo @@ -117,6 +122,67 @@ } } + + private fun dumpModel(dir: String, chunk: List<Module>) { + + val modules = Element("modules").apply { + + for (module in chunk) { + addContent(Element("module").apply { + + attributes.add( + Attribute("name", module.getModuleName()) + ) + attributes.add( + Attribute("type", module.getModuleType()) + ) + attributes.add( + Attribute("outputDir", module.getOutputDirectory()) + ) + + for (friendDir in module.getFriendPaths()) { + addContent(Element("friendDir").setAttribute("path", friendDir)) + } + for (source in module.getSourceFiles()) { + addContent(Element("sources").setAttribute("path", source)) + } + for (javaSourceRoots in module.getJavaSourceRoots()) { + addContent(Element("javaSourceRoots").setAttribute("path", javaSourceRoots.path)) + } + for (classpath in module.getClasspathRoots()) { + addContent(Element("classpath").setAttribute("path", classpath)) + } + for (commonSources in module.getCommonSourceFiles()) { + addContent(Element("commonSources").setAttribute("path", commonSources)) + } + + }) + } + } + val document = Document(modules) + val outputter = XMLOutputter(Format.getPrettyFormat()) + val dirFile = File(dir) + if (!dirFile.exists()) { + dirFile.mkdirs() + } + val fileName = "model-${chunk.first().getModuleName()}" + var counter = 0 + fun file(): File { + val postfix = if (counter != 0) ".$counter" else "" + return File(dirFile, "$fileName$postfix.xml") + } + + var outputFile: File + do { + outputFile = file() + counter++ + } while (outputFile.exists()) + outputFile.bufferedWriter().use { + outputter.output(document, it) + } + + } + private fun Module.getSourceFiles( environment: KotlinCoreEnvironment, localFileSystem: VirtualFileSystem, @@ -169,6 +235,11 @@ moduleVisibilityManager.addFriendPath(path) } + val dumpModelDir = environment.configuration.get(CommonConfigurationKeys.DUMP_MODEL) + if (dumpModelDir != null) { + dumpModel(dumpModelDir, chunk) + } + val projectConfiguration = environment.configuration if (projectConfiguration.getBoolean(CommonConfigurationKeys.USE_FIR)) { return compileModulesUsingFrontendIR(environment, buildFile, chunk)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.kt b/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.kt index 0ec5252..1e773e1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.kt
@@ -47,6 +47,9 @@ @JvmField val KLIB_MPP = CompilerConfigurationKey.create<Boolean>("Klib based MPP") + + @JvmField + val DUMP_MODEL = CompilerConfigurationKey.create<String>("Dump compiler arguments") } var CompilerConfiguration.languageVersionSettings: LanguageVersionSettings