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

This commit is contained in:
swift-ci
2018-05-17 15:09:01 -07:00
16 changed files with 112 additions and 325 deletions

View File

@@ -621,7 +621,7 @@ UnifiedStatsReporter::~UnifiedStatsReporter()
raw_fd_ostream ostream(StatsFilename, EC, fs::F_Append | fs::F_Text);
if (EC) {
llvm::errs() << "Error opening -stats-output-dir file '"
<< TraceFilename << "' for writing\n";
<< StatsFilename << "' for writing\n";
return;
}