averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +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-05-31 21:48:40 -07:00
parent 1cc89cd897 d20f4a8a3e
commit c019ae6ffb
35 changed files with 300 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Frontend/CompilerInvocation.cpp
View File

@@ -1405,6 +1405,8 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
IRGenOpts.Sanitize = Opts.Sanitize;
}
if (Opts.Optimization > SILOptions::SILOptMode::None)
Opts.EnforceExclusivityDynamic = false;
if (const Arg *A = Args.getLastArg(options::OPT_enforce_exclusivity_EQ)) {
parseExclusivityEnforcementOptions(A, Opts, Diags);
}