Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
swift-ci
2017-05-22 15:48:35 -07:00
8 changed files with 138 additions and 11 deletions

View File

@@ -1374,6 +1374,7 @@ 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.EnableLargeLoadableTypes |= Args.hasArg(OPT_enable_large_loadable_types);
if (Args.hasArg(OPT_debug_on_sil)) {
// Derive the name of the SIL file for debugging from