From e4a8e0ea45521359b22d4a08ccce119b02a22e8f Mon Sep 17 00:00:00 2001 From: Hamish Knight Date: Wed, 8 Jul 2020 22:14:32 -0700 Subject: [PATCH] Remove -sil-merge-partial-modules This is now the default behaviour for -merge-modules. Stop passing it in the driver and remove it from FrontendOptions.td. --- include/swift/Option/FrontendOptions.td | 4 ---- lib/Driver/ToolChains.cpp | 3 --- 2 files changed, 7 deletions(-) diff --git a/include/swift/Option/FrontendOptions.td b/include/swift/Option/FrontendOptions.td index b9f4adbceb59a..d465a0f1dfb71 100644 --- a/include/swift/Option/FrontendOptions.td +++ b/include/swift/Option/FrontendOptions.td @@ -554,10 +554,6 @@ def sil_unroll_threshold : Separate<["-"], "sil-unroll-threshold">, MetaVarName<"<250>">, HelpText<"Controls the aggressiveness of loop unrolling">; -// FIXME: This option is now redundant and should eventually be removed. -def sil_merge_partial_modules : Flag<["-"], "sil-merge-partial-modules">, - Alias; - def sil_verify_all : Flag<["-"], "sil-verify-all">, HelpText<"Verify SIL after each transform">; diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 3e158c76274cf..e3447e1fb9672 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -981,9 +981,6 @@ ToolChain::constructInvocation(const MergeModuleJobAction &job, // serialized ASTs. Arguments.push_back("-parse-as-library"); - // Merge serialized SIL from partial modules. - Arguments.push_back("-sil-merge-partial-modules"); - // Disable SIL optimization passes; we've already optimized the code in each // partial mode. Arguments.push_back("-disable-diagnostic-passes");