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

Use old backend in script compilation context

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-01-15 10:01:15 +03:00
parent ee1aff1012
commit cd93b2f39b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt
+4 -3
View File
@@ -140,7 +140,7 @@ internal fun createInitialConfigurations(
createInitialCompilerConfiguration( createInitialCompilerConfiguration(
scriptCompilationConfiguration, hostConfiguration, messageCollector, ignoredOptionsReportingState scriptCompilationConfiguration, hostConfiguration, messageCollector, ignoredOptionsReportingState
) )
kotlinCompilerConfiguration.put(JVMConfigurationKeys.IR, false)
val initialScriptCompilationConfiguration = val initialScriptCompilationConfiguration =
scriptCompilationConfiguration.withUpdatesFromCompilerConfiguration(kotlinCompilerConfiguration) scriptCompilationConfiguration.withUpdatesFromCompilerConfiguration(kotlinCompilerConfiguration)
@@ -298,14 +298,15 @@ private fun CompilerConfiguration.updateWithRefinedConfigurations(
messageCollector: ScriptDiagnosticsMessageCollector messageCollector: ScriptDiagnosticsMessageCollector
) { ) {
val dependenciesProvider = ScriptDependenciesProvider.getInstance(context.environment.project) val dependenciesProvider = ScriptDependenciesProvider.getInstance(context.environment.project)
val updatedCompilerOptions = sourceFiles.flatMap { val updatedCompilerOptions = sourceFiles.flatMapTo(mutableListOf<String>()) {
dependenciesProvider?.getScriptConfiguration(it)?.configuration?.get( dependenciesProvider?.getScriptConfiguration(it)?.configuration?.get(
ScriptCompilationConfiguration.compilerOptions ScriptCompilationConfiguration.compilerOptions
) ?: emptyList() ) ?: emptyList()
} }
updatedCompilerOptions += "-Xuse-old-backend"
if (updatedCompilerOptions.isNotEmpty() && if (updatedCompilerOptions.isNotEmpty() &&
updatedCompilerOptions != context.baseScriptCompilationConfiguration[ScriptCompilationConfiguration.compilerOptions] updatedCompilerOptions != context.baseScriptCompilationConfiguration[ScriptCompilationConfiguration.compilerOptions]
) { ) {
updateWithCompilerOptions(updatedCompilerOptions, messageCollector, context.ignoredOptionsReportingState, true) updateWithCompilerOptions(updatedCompilerOptions, messageCollector, context.ignoredOptionsReportingState, true)
} }
} }