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 remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2017-04-28 21:48:31 -07:00
parent f15cad3609 8ecc3e31cf
commit 9997fddb3a
16 changed files with 446 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Frontend/CompilerInvocation.cpp
View File

@@ -1228,6 +1228,12 @@ void parseExclusivityEnforcementOptions(const llvm::opt::Arg *A,
Diags.diagnose(SourceLoc(), diag::error_unsupported_option_argument,
A->getOption().getPrefixedName(), A->getValue());
}
if (Opts.Optimization > SILOptions::SILOptMode::None
&& Opts.EnforceExclusivityDynamic) {
Diags.diagnose(SourceLoc(),
diag::warning_argument_not_supported_with_optimization,
A->getOption().getPrefixedName() + A->getValue());
}
}
static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,