averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed flag checking for lexical borrow scopes.

Browse Source 
Previously the following pairs were prohibited incorrectly:
- -enable-lexical-borrow-scopes=true, -enable-experimental-move-only
- -enable-lexical-lifetimes=true, -enable-experimental-move-only
and the following pairs were allowed incorrectly:
- -enable-lexical-borrow-scopes=false, -enable-experimental-move-only
- -enable-lexical-lifetimes=false, -enable-experimental-move-only
Here, that's fixed.  The first two pairs are allowed and the second two
pairs prohibited.
This commit is contained in:
Nate Chandler
2021-12-13 14:55:01 -08:00
parent 5e9530429c
commit 0cee5b227e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Frontend/CompilerInvocation.cpp
View File

@@ -1495,7 +1495,7 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
}
if (Args.hasArg(OPT_enable_experimental_move_only) &&
(enableLexicalBorrowScopesFlag.getValueOr(false))) {
!enableLexicalBorrowScopesFlag.getValueOr(true)) {
// Error if move-only is enabled and lexical borrow scopes--on which it
// depends--has been disabled.
Diags.diagnose(SourceLoc(), diag::error_invalid_arg_combination,
@@ -1505,7 +1505,7 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
}
if (Args.hasArg(OPT_enable_experimental_move_only) &&
(enableLexicalLifetimesFlag.getValueOr(false))) {
!enableLexicalLifetimesFlag.getValueOr(true)) {
// Error if move-only is enabled and lexical lifetimes--on which it
// depends--has been disabled.
Diags.diagnose(SourceLoc(), diag::error_invalid_arg_combination,