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

Made phase switcher aware of compiler args

Browse Source
This commit is contained in:
Igor Chevdar
2019-07-26 13:32:11 +05:00
parent 80480fc3d7
commit b5a71cb88e
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt
+12 -9
View File
@@ -357,6 +357,9 @@ val toplevelPhase: CompilerPhase<*, Unit, Unit> = namedUnitPhase(
linkPhase linkPhase
) )
internal fun PhaseConfig.switchSoft(phase: AnyNamedPhase, onOff: Boolean) =
switch(phase, enabled.contains(phase) && onOff)
internal fun PhaseConfig.konanPhasesConfig(config: KonanConfig) { internal fun PhaseConfig.konanPhasesConfig(config: KonanConfig) {
with(config.configuration) { with(config.configuration) {
disable(compileTimeEvaluatePhase) disable(compileTimeEvaluatePhase)
@@ -365,14 +368,14 @@ internal fun PhaseConfig.konanPhasesConfig(config: KonanConfig) {
disable(serializeDFGPhase) disable(serializeDFGPhase)
// Don't serialize anything to a final executable. // Don't serialize anything to a final executable.
switch(serializerPhase, config.produce == CompilerOutputKind.LIBRARY) switchSoft(serializerPhase, config.produce == CompilerOutputKind.LIBRARY)
switch(dependenciesLowerPhase, config.produce != CompilerOutputKind.LIBRARY) switchSoft(dependenciesLowerPhase, config.produce != CompilerOutputKind.LIBRARY)
switch(bitcodePhase, config.produce != CompilerOutputKind.LIBRARY) switchSoft(bitcodePhase, config.produce != CompilerOutputKind.LIBRARY)
switch(linkPhase, config.produce.isNativeBinary) switchSoft(linkPhase, config.produce.isNativeBinary)
switch(testProcessorPhase, getNotNull(KonanConfigKeys.GENERATE_TEST_RUNNER) != TestRunnerKind.NONE) switchSoft(testProcessorPhase, getNotNull(KonanConfigKeys.GENERATE_TEST_RUNNER) != TestRunnerKind.NONE)
switch(buildDFGPhase, config.configuration.getBoolean(KonanConfigKeys.OPTIMIZATION)) switchSoft(buildDFGPhase, getBoolean(KonanConfigKeys.OPTIMIZATION))
switch(devirtualizationPhase, config.configuration.getBoolean(KonanConfigKeys.OPTIMIZATION)) switchSoft(devirtualizationPhase, getBoolean(KonanConfigKeys.OPTIMIZATION))
switch(dcePhase, config.configuration.getBoolean(KonanConfigKeys.OPTIMIZATION)) switchSoft(dcePhase, getBoolean(KonanConfigKeys.OPTIMIZATION))
switch(verifyBitcodePhase, config.needCompilerVerification || config.configuration.getBoolean(KonanConfigKeys.VERIFY_BITCODE)) switchSoft(verifyBitcodePhase, config.needCompilerVerification || getBoolean(KonanConfigKeys.VERIFY_BITCODE))
} }
} }