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

This commit is contained in:
swift_jenkins
2020-03-25 10:45:22 -07:00
20 changed files with 681 additions and 7 deletions

View File

@@ -442,8 +442,15 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
if (Args.hasArg(OPT_fine_grained_dependency_include_intrafile))
Opts.FineGrainedDependenciesIncludeIntrafileOnes = true;
if (Args.hasArg(OPT_enable_experimental_differentiable_programming))
if (Args.hasArg(OPT_enable_experimental_additive_arithmetic_derivation))
Opts.EnableExperimentalAdditiveArithmeticDerivedConformances = true;
if (Args.hasArg(OPT_enable_experimental_differentiable_programming)) {
Opts.EnableExperimentalDifferentiableProgramming = true;
// Differentiable programming implies `AdditiveArithmetic` derived
// conformances.
Opts.EnableExperimentalAdditiveArithmeticDerivedConformances = true;
}
Opts.DebuggerSupport |= Args.hasArg(OPT_debugger_support);
if (Opts.DebuggerSupport)