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

This commit is contained in:
swift-ci
2019-11-08 13:30:07 -08:00
15 changed files with 138 additions and 1 deletions

View File

@@ -319,6 +319,8 @@ void CompilerInstance::setUpDiagnosticOptions() {
if (Invocation.getDiagnosticOptions().EnableDescriptiveDiagnostics) {
Diagnostics.setUseDescriptiveDiagnostics(true);
}
Diagnostics.setDiagnosticDocumentationPath(
Invocation.getDiagnosticOptions().DiagnosticDocumentationPath);
}
// The ordering of ModuleLoaders is important!