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

This commit is contained in:
swift_jenkins
2020-03-27 15:42:21 -07:00
14 changed files with 61 additions and 52 deletions

View File

@@ -2150,6 +2150,9 @@ int swift::performFrontend(ArrayRef<const char *> Args,
if (Invocation.getDiagnosticOptions().UseColor)
PDC.forceColors();
PDC.setPrintEducationalNotes(
Invocation.getDiagnosticOptions().PrintEducationalNotes);
// Temporarily stage the new diagnostic formatting style behind
// -enable-descriptive-diagnostics
if (Invocation.getDiagnosticOptions().EnableExperimentalFormatting)