Skip to content

Swap the alias relationship between -language-mode and -swift-version. #87284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjmansfield merged 1 commit into from
Feb 20, 2026
Merged

Swap the alias relationship between -language-mode and -swift-version. #87284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions include/swift/Option/Options.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,18 +285,18 @@ def sdk : Separate<["-"], "sdk">,
SwiftAPIDigesterOption, SwiftSynthesizeInterfaceOption]>,
HelpText<"Compile against <sdk>">, MetaVarName<"<sdk>">;

def swift_version : Separate<["-"], "swift-version">,
Flags<[FrontendOption, ModuleInterfaceOption, SwiftSymbolGraphExtractOption,
SwiftAPIDigesterOption, SwiftSynthesizeInterfaceOption]>,
HelpText<"Interpret input according to a specific Swift language version number">,
MetaVarName<"<vers>">;

def language_mode : Separate<["-"], "language-mode">,
Flags<[FrontendOption, ModuleInterfaceOption, SwiftSymbolGraphExtractOption,
SwiftAPIDigesterOption, SwiftSynthesizeInterfaceOption]>,
HelpText<"Interpret input according to a specific Swift language mode">,
MetaVarName<"<mode>">,
Alias<swift_version>;
MetaVarName<"<mode>">;

def swift_version : Separate<["-"], "swift-version">,
Flags<[FrontendOption, HelpHidden, ModuleInterfaceOption, SwiftSymbolGraphExtractOption,
SwiftAPIDigesterOption, SwiftSynthesizeInterfaceOption]>,
HelpText<"Interpret input according to a specific Swift language version number">,
MetaVarName<"<vers>">,
Alias<language_mode>;

def min_swift_runtime_version
: Separate<["-"], "min-swift-runtime-version">,
Expand Down
2 changes: 1 addition & 1 deletion lib/Driver/ToolChains.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
inputArgs.AddLastArg(arguments, options::OPT_sanitize_coverage_EQ);
inputArgs.AddLastArg(arguments, options::OPT_sanitize_stable_abi_EQ);
inputArgs.AddLastArg(arguments, options::OPT_static);
inputArgs.AddLastArg(arguments, options::OPT_swift_version);
inputArgs.AddLastArg(arguments, options::OPT_language_mode);
inputArgs.AddLastArg(arguments, options::OPT_enforce_exclusivity_EQ);
inputArgs.AddLastArg(arguments, options::OPT_stats_output_dir);
inputArgs.AddLastArg(arguments, options::OPT_tools_directory);
Expand Down
2 changes: 1 addition & 1 deletion lib/DriverTool/swift_api_digester_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2375,7 +2375,7 @@ class SwiftAPIDigesterInvocation {
SDK = ParsedArgs.getLastArgValue(OPT_sdk).str();
BaselineSDK = ParsedArgs.getLastArgValue(OPT_bsdk).str();
Triple = ParsedArgs.getLastArgValue(OPT_target).str();
SwiftVersion = ParsedArgs.getLastArgValue(OPT_swift_version).str();
SwiftVersion = ParsedArgs.getLastArgValue(OPT_language_mode).str();
SystemFrameworkPaths = ParsedArgs.getAllArgValues(OPT_Fsystem);
BaselineFrameworkPaths = ParsedArgs.getAllArgValues(OPT_BF);
FrameworkPaths = ParsedArgs.getAllArgValues(OPT_F);
Expand Down
2 changes: 1 addition & 1 deletion lib/DriverTool/swift_symbolgraph_extract_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ int swift_symbolgraph_extract_main(ArrayRef<const char *> Args,
Invocation.getClangImporterOptions().ImportForwardDeclarations = true;
Invocation.setDefaultPrebuiltCacheIfNecessary();

if (auto *A = ParsedArgs.getLastArg(OPT_swift_version)) {
if (auto *A = ParsedArgs.getLastArg(OPT_language_mode)) {
using version::Version;
auto SwiftVersion = A->getValue();
bool isValid = false;
Expand Down
2 changes: 1 addition & 1 deletion lib/DriverTool/swift_synthesize_interface_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ int swift_synthesize_interface_main(ArrayRef<const char *> Args,
Invocation.getClangImporterOptions().ImportForwardDeclarations = true;
Invocation.setDefaultPrebuiltCacheIfNecessary();

if (auto *A = ParsedArgs.getLastArg(OPT_swift_version)) {
if (auto *A = ParsedArgs.getLastArg(OPT_language_mode)) {
using version::Version;
auto SwiftVersion = A->getValue();
bool isValid = false;
Expand Down
2 changes: 1 addition & 1 deletion lib/Frontend/CompilerInvocation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
FrontendOpts.RequestedAction);
bool HadError = false;

if (auto A = Args.getLastArg(OPT_swift_version)) {
if (auto A = Args.getLastArg(OPT_language_mode)) {
auto vers =
VersionParser::parseVersionString(A->getValue(), SourceLoc(), &Diags);
bool isValid = false;
Expand Down
2 changes: 1 addition & 1 deletion test/CAS/module_deps_include_tree.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ import SubE
// CHECK: "-cas-path"
// CHECK: "-module-name"
// CHECK: "G"
// CHECK: "-swift-version"
// CHECK: {{"-language-mode"|"-swift-version"}}
// CHECK: "5"
// CHECK: ],
// CHECK: "contextHash": "{{.*}}",
Expand Down
2 changes: 1 addition & 1 deletion test/CAS/plugin_cas.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ import SubE
// CHECK: "-target"
// CHECK: "-module-name"
// CHECK: "G"
// CHECK: "-swift-version"
// CHECK: {{"-language-mode"|"-swift-version"}}
// CHECK: "5"
// CHECK: ],
// CHECK: "contextHash": "{{.*}}",
Expand Down
2 changes: 1 addition & 1 deletion test/Driver/createCompilerInvocation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// NORMAL_ARGS-DAG: -o{{$}}
// NORMAL_ARGS-DAG: foo-{{[a-z0-9]+}}.o
// NORMAL_ARGS-DAG: -c{{$}}
// NORMAL_ARGS-DAG: -swift-version
// NORMAL_ARGS-DAG: -language-mode
// NORMAL_ARGS-DAG: -module-name
// NORMAL_ARGS-DAG: -emit-module-path
// NORMAL_ARGS-DAG: -emit-module-doc-path
Expand Down
2 changes: 1 addition & 1 deletion test/Driver/help.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// RUN: %swift_driver -help | %FileCheck -check-prefix NEGATIVE -check-prefix NEGATIVE-SWIFT %s

// Options that work with both 'swiftc' and 'swift':
// CHECK-DAG: -swift-version
// CHECK-DAG: -language-mode

// swiftc-only options:
// CHECK-SWIFTC-DAG: -typecheck
Expand Down
2 changes: 1 addition & 1 deletion test/ModuleInterface/package_interface_disable_package_name.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// RUN: %FileCheck %s < %t/Bar.private.swiftinterface
// RUN: %FileCheck %s < %t/Bar.package.swiftinterface

// CHECK: -enable-library-evolution -package-name barpkg -swift-version 6 -module-name Bar
// CHECK: -enable-library-evolution -package-name barpkg -language-mode 6 -module-name Bar

/// Building modules from non-package interfaces with package-name (default mode) should succeed.
// RUN: %target-swift-frontend -compile-module-from-interface %t/Bar.swiftinterface -o %t/Bar.swiftmodule -module-name Bar
Expand Down
2 changes: 1 addition & 1 deletion test/ScanDependencies/module_deps.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ import SubE
// CHECK: "-target"
// CHECK: "-module-name"
// CHECK: "G"
// CHECK: "-swift-version"
// CHECK: {{"-language-mode"|"-swift-version"}}
// CHECK: "5"
// CHECK: ],

Expand Down
2 changes: 1 addition & 1 deletion test/ScanDependencies/module_deps_cache_reuse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ import SubE
// CHECK: "-target"
// CHECK: "-module-name"
// CHECK: "G"
// CHECK: "-swift-version"
// CHECK: {{"-language-mode"|"-swift-version"}}
// CHECK: "5"
// CHECK: ],
// CHECK: "contextHash": "{{.*}}",
Expand Down