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

This commit is contained in:
swift_jenkins
2020-07-28 14:23:42 -07:00
33 changed files with 1223 additions and 390 deletions

View File

@@ -573,6 +573,10 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
Opts.EnableConcisePoundFile =
Args.hasArg(OPT_enable_experimental_concise_pound_file);
Opts.EnableFuzzyForwardScanTrailingClosureMatching =
Args.hasFlag(OPT_enable_fuzzy_forward_scan_trailing_closure_matching,
OPT_disable_fuzzy_forward_scan_trailing_closure_matching,
true);
Opts.EnableCrossImportOverlays =
Args.hasFlag(OPT_enable_cross_import_overlays,