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-18 18:28:31 -07:00
parent e5e0b13abf 6eb7c0dbf5
commit d4ee5691fd
6 changed files with 53 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Frontend/CompilerInvocation.cpp
View File

@@ -1315,6 +1315,8 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
|= Args.hasArg(OPT_assume_parsing_unqualified_ownership_sil);
Opts.EnableMandatorySemanticARCOpts |=
!Args.hasArg(OPT_disable_mandatory_semantic_arc_opts);
Opts.SuppressStaticExclusivitySwap |=
Args.hasArg(OPT_suppress_static_exclusivity_swap);
if (Args.hasArg(OPT_debug_on_sil)) {
// Derive the name of the SIL file for debugging from