Skip to content

Commit cf54923

Browse files
committed
Remove -sil-merge-partial-modules
This is now the default behaviour for -merge-modules.
1 parent efc9e26 commit cf54923

File tree

2 files changed

+0
-5
lines changed

2 files changed

+0
-5
lines changed

Sources/SwiftDriver/Jobs/MergeModuleJob.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ extension Driver {
3333
// serialized ASTs.
3434
commandLine.appendFlag(.parseAsLibrary)
3535

36-
// Merge serialized SIL from partial modules.
37-
commandLine.appendFlag(.silMergePartialModules)
38-
3936
// Disable SIL optimization passes; we've already optimized the code in each
4037
// partial mode.
4138
commandLine.appendFlag(.disableDiagnosticPasses)

Sources/SwiftOptions/Options.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,6 @@ extension Option {
394394
public static let silDebugSerialization: Option = Option("-sil-debug-serialization", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Do not eliminate functions in Mandatory Inlining/SILCombine dead functions. (for debugging only)")
395395
public static let silInlineCallerBenefitReductionFactor: Option = Option("-sil-inline-caller-benefit-reduction-factor", .separate, attributes: [.helpHidden, .frontend, .noDriver], metaVar: "<2>", helpText: "Controls the aggressiveness of performance inlining in -Osize mode by reducing the base benefits of a caller (lower value permits more inlining!)")
396396
public static let silInlineThreshold: Option = Option("-sil-inline-threshold", .separate, attributes: [.helpHidden, .frontend, .noDriver], metaVar: "<50>", helpText: "Controls the aggressiveness of performance inlining")
397-
public static let silMergePartialModules: Option = Option("-sil-merge-partial-modules", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Merge SIL from all partial swiftmodules into the final module")
398397
public static let silUnrollThreshold: Option = Option("-sil-unroll-threshold", .separate, attributes: [.helpHidden, .frontend, .noDriver], metaVar: "<250>", helpText: "Controls the aggressiveness of loop unrolling")
399398
public static let silVerifyAll: Option = Option("-sil-verify-all", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Verify SIL after each transform")
400399
public static let silVerifyNone: Option = Option("-sil-verify-none", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Completely disable SIL verification")
@@ -867,7 +866,6 @@ extension Option {
867866
Option.silDebugSerialization,
868867
Option.silInlineCallerBenefitReductionFactor,
869868
Option.silInlineThreshold,
870-
Option.silMergePartialModules,
871869
Option.silUnrollThreshold,
872870
Option.silVerifyAll,
873871
Option.silVerifyNone,

0 commit comments

Comments
 (0)