Merge branch 'main' into rebranch

Conflicts:
	include/swift/Basic/AnyValue.h
This commit is contained in:
Nate Chandler
2021-01-12 16:30:02 -08:00
97 changed files with 1467 additions and 2100 deletions

View File

@@ -503,13 +503,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
if (Args.getLastArg(OPT_debug_cycles))
Opts.DebugDumpCycles = true;
if (Args.getLastArg(OPT_build_request_dependency_graph))
Opts.BuildRequestDependencyGraph = true;
if (const Arg *A = Args.getLastArg(OPT_output_request_graphviz)) {
Opts.RequestEvaluatorGraphVizPath = A->getValue();
}
if (Args.getLastArg(OPT_require_explicit_availability, OPT_require_explicit_availability_target)) {
Opts.RequireExplicitAvailability = true;
if (const Arg *A = Args.getLastArg(OPT_require_explicit_availability_target)) {