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

Review fix

Browse Source
This commit is contained in:
Igor Chevdar
2019-07-26 13:50:24 +05:00
parent b5a71cb88e
commit 67f01540ed
1 changed files with 16 additions and 11 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
+16 -11
View File
@@ -357,8 +357,13 @@ val toplevelPhase: CompilerPhase<*, Unit, Unit> = namedUnitPhase(
linkPhase linkPhase
) )
internal fun PhaseConfig.switchSoft(phase: AnyNamedPhase, onOff: Boolean) = internal fun PhaseConfig.disableIf(phase: AnyNamedPhase, condition: Boolean) {
switch(phase, enabled.contains(phase) && onOff) if (condition) disable(phase)
}
internal fun PhaseConfig.disableUnless(phase: AnyNamedPhase, condition: Boolean) {
if (!condition) disable(phase)
}
internal fun PhaseConfig.konanPhasesConfig(config: KonanConfig) { internal fun PhaseConfig.konanPhasesConfig(config: KonanConfig) {
with(config.configuration) { with(config.configuration) {
@@ -368,14 +373,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.
switchSoft(serializerPhase, config.produce == CompilerOutputKind.LIBRARY) disableUnless(serializerPhase, config.produce == CompilerOutputKind.LIBRARY)
switchSoft(dependenciesLowerPhase, config.produce != CompilerOutputKind.LIBRARY) disableIf(dependenciesLowerPhase, config.produce == CompilerOutputKind.LIBRARY)
switchSoft(bitcodePhase, config.produce != CompilerOutputKind.LIBRARY) disableIf(bitcodePhase, config.produce == CompilerOutputKind.LIBRARY)
switchSoft(linkPhase, config.produce.isNativeBinary) disableUnless(linkPhase, config.produce.isNativeBinary)
switchSoft(testProcessorPhase, getNotNull(KonanConfigKeys.GENERATE_TEST_RUNNER) != TestRunnerKind.NONE) disableIf(testProcessorPhase, getNotNull(KonanConfigKeys.GENERATE_TEST_RUNNER) == TestRunnerKind.NONE)
switchSoft(buildDFGPhase, getBoolean(KonanConfigKeys.OPTIMIZATION)) disableUnless(buildDFGPhase, getBoolean(KonanConfigKeys.OPTIMIZATION))
switchSoft(devirtualizationPhase, getBoolean(KonanConfigKeys.OPTIMIZATION)) disableUnless(devirtualizationPhase, getBoolean(KonanConfigKeys.OPTIMIZATION))
switchSoft(dcePhase, getBoolean(KonanConfigKeys.OPTIMIZATION)) disableUnless(dcePhase, getBoolean(KonanConfigKeys.OPTIMIZATION))
switchSoft(verifyBitcodePhase, config.needCompilerVerification || getBoolean(KonanConfigKeys.VERIFY_BITCODE)) disableUnless(verifyBitcodePhase, config.needCompilerVerification || getBoolean(KonanConfigKeys.VERIFY_BITCODE))
} }
} }