Revert "Merge remote-tracking branch 'origin/master-next'"

This reverts commit 1c9b0908e6, reversing
changes made to 3eb82c1836.
This commit is contained in:
Karoy Lorentey
2020-06-08 16:48:38 -07:00
parent 1c9b0908e6
commit 68351d2110
53 changed files with 234 additions and 262 deletions

View File

@@ -2803,7 +2803,7 @@ static std::string getJsonOutputFilePath(llvm::Triple Triple, bool ABI) {
exit(1);
}
llvm::sys::path::append(OutputPath, getBaselineFilename(Triple));
return OutputPath.str().str();
return OutputPath.str();
}
llvm::errs() << "Unable to decide output file path\n";
exit(1);