From cd93b2f39bea8c97f48fbb4e1f4d37ff9a061e60 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 15 Jan 2021 10:01:15 +0300 Subject: [PATCH] Use old backend in script compilation context --- .../scripting/compiler/plugin/impl/compilationContext.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt index 7d132eefffd..e44fbe24eb7 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt @@ -140,7 +140,7 @@ internal fun createInitialConfigurations( createInitialCompilerConfiguration( scriptCompilationConfiguration, hostConfiguration, messageCollector, ignoredOptionsReportingState ) - + kotlinCompilerConfiguration.put(JVMConfigurationKeys.IR, false) val initialScriptCompilationConfiguration = scriptCompilationConfiguration.withUpdatesFromCompilerConfiguration(kotlinCompilerConfiguration) @@ -298,14 +298,15 @@ private fun CompilerConfiguration.updateWithRefinedConfigurations( messageCollector: ScriptDiagnosticsMessageCollector ) { val dependenciesProvider = ScriptDependenciesProvider.getInstance(context.environment.project) - val updatedCompilerOptions = sourceFiles.flatMap { + val updatedCompilerOptions = sourceFiles.flatMapTo(mutableListOf()) { dependenciesProvider?.getScriptConfiguration(it)?.configuration?.get( ScriptCompilationConfiguration.compilerOptions ) ?: emptyList() } + updatedCompilerOptions += "-Xuse-old-backend" if (updatedCompilerOptions.isNotEmpty() && updatedCompilerOptions != context.baseScriptCompilationConfiguration[ScriptCompilationConfiguration.compilerOptions] ) { updateWithCompilerOptions(updatedCompilerOptions, messageCollector, context.ignoredOptionsReportingState, true) } -} \ No newline at end of file +}