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

Merge pull request #42445 from DougGregor/strict-concurrency-flag

Browse Source
This commit is contained in:
Doug Gregor
2022-04-19 08:07:30 -07:00
committed by GitHub
parent e1be5321b9 d20064443f
commit 12a11e5416
13 changed files with 100 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Frontend/CompilerInvocation.cpp
View File

@@ -692,7 +692,28 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
}
}
Opts.WarnConcurrency |= Args.hasArg(OPT_warn_concurrency);
// Swift 6+ uses the strictest concurrency level.
if (Opts.isSwiftVersionAtLeast(6)) {
Opts.StrictConcurrencyLevel = StrictConcurrency::On;
} else if (const Arg *A = Args.getLastArg(OPT_strict_concurrency)) {
auto value = llvm::StringSwitch<Optional<StrictConcurrency>>(A->getValue())
.Case("off", StrictConcurrency::Off)
.Case("limited", StrictConcurrency::Limited)
.Case("on", StrictConcurrency::On)
.Default(None);
if (value)
Opts.StrictConcurrencyLevel = *value;
else
Diags.diagnose(SourceLoc(), diag::error_invalid_arg_value,
A->getAsString(Args), A->getValue());
} else if (Args.hasArg(OPT_warn_concurrency)) {
Opts.StrictConcurrencyLevel = StrictConcurrency::On;
} else {
// Default to "limited" checking in Swift 5.x.
Opts.StrictConcurrencyLevel = StrictConcurrency::Limited;
}
Opts.WarnImplicitOverrides =
Args.hasArg(OPT_warn_implicit_overrides);