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

This commit is contained in:
swift_jenkins
2020-04-22 15:57:30 -07:00
88 changed files with 972 additions and 402 deletions

View File

@@ -402,10 +402,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
}
Opts.DisableParserLookup |= Args.hasArg(OPT_disable_parser_lookup);
Opts.EnableRequestBasedIncrementalDependencies =
Args.hasFlag(OPT_enable_request_based_incremental_dependencies,
OPT_disable_request_based_incremental_dependencies,
Opts.EnableRequestBasedIncrementalDependencies);
Opts.EnableASTScopeLookup =
Args.hasFlag(options::OPT_enable_astscope_lookup,
options::OPT_disable_astscope_lookup, Opts.EnableASTScopeLookup) ||