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

Use CLI compiler arguments directly in PhaseConfig creation

Browse Source
This commit is contained in:
Georgy Bronnikov
2019-03-21 17:18:07 +03:00
parent 40079f7cae
commit fae003866b
16 changed files with 105 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateIrRuntime.kt
+3 -2
View File
@@ -9,7 +9,8 @@ import com.intellij.openapi.Disposable
import com.intellij.openapi.vfs.StandardFileSystems
import com.intellij.openapi.vfs.VirtualFileManager
import com.intellij.psi.PsiManager
import org.jetbrains.kotlin.cli.common.createPhaseConfig
import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.config.*
@@ -64,7 +65,7 @@ fun main() {
project = environment.project,
files = sources.map(::createPsiFile),
configuration = configuration,
phaseConfig = createPhaseConfig(jsPhases, configuration),
phaseConfig = configuration.get(CLIConfigurationKeys.PHASE_CONFIG) ?: PhaseConfig(jsPhases),
compileMode = CompilationMode.KLIB,
immediateDependencies = emptyList(),
allDependencies = emptyList(),
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt
+3 -2
View File
@@ -5,7 +5,8 @@
package org.jetbrains.kotlin.js.test
import org.jetbrains.kotlin.cli.common.createPhaseConfig
import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.ir.backend.js.*
import org.jetbrains.kotlin.js.config.JSConfigurationKeys
@@ -110,7 +111,7 @@ abstract class BasicIrBoxTest(
project = config.project,
files = filesToCompile,
configuration = config.configuration,
phaseConfig = createPhaseConfig(jsPhases, config.configuration),
phaseConfig = config.configuration.get(CLIConfigurationKeys.PHASE_CONFIG) ?: PhaseConfig(jsPhases),
compileMode = if (isMainModule) CompilationMode.JS else CompilationMode.KLIB,
immediateDependencies = dependencies,
allDependencies = allDependencies,