Support: Stop using F_{None,Text,Append} compatibility synonyms, NFC

Stop using the compatibility spellings of `OF_{None,Text,Append}`
left behind by 1f67a3cba9. A follow-up
will remove them.

Differential Revision: https://reviews.llvm.org/D101650
This commit is contained in:
Duncan P. N. Exon Smith 2021-04-28 18:18:35 -07:00
parent 499e89fc91
commit 518d955f9d
9 changed files with 10 additions and 10 deletions

View File

@ -122,7 +122,7 @@ void WriteJSON(StringRef JsonPath, llvm::json::Object &&ClassInheritance,
} }
std::error_code EC; std::error_code EC;
llvm::raw_fd_ostream JsonOut(JsonPath, EC, llvm::sys::fs::F_Text); llvm::raw_fd_ostream JsonOut(JsonPath, EC, llvm::sys::fs::OF_Text);
if (EC) if (EC)
return; return;

View File

@ -71,7 +71,7 @@ int main(int argc, const char **argv) {
if (SkipProcessing) { if (SkipProcessing) {
std::error_code EC; std::error_code EC;
llvm::raw_fd_ostream JsonOut(JsonOutputPath, EC, llvm::sys::fs::F_Text); llvm::raw_fd_ostream JsonOut(JsonOutputPath, EC, llvm::sys::fs::OF_Text);
if (EC) if (EC)
return 1; return 1;
JsonOut << formatv("{0:2}", llvm::json::Value(llvm::json::Object())); JsonOut << formatv("{0:2}", llvm::json::Value(llvm::json::Object()));

View File

@ -95,10 +95,10 @@ int main(int argc, char **argv) {
std::error_code EC; std::error_code EC;
#if HAVE_LLVM >= 0x0600 #if HAVE_LLVM >= 0x0600
std::unique_ptr<ToolOutputFile> Out( std::unique_ptr<ToolOutputFile> Out(
new ToolOutputFile(OutputFilename, EC, sys::fs::F_None)); new ToolOutputFile(OutputFilename, EC, sys::fs::OF_None));
#else #else
std::unique_ptr<tool_output_file> Out( std::unique_ptr<tool_output_file> Out(
new tool_output_file(OutputFilename, EC, sys::fs::F_None)); new tool_output_file(OutputFilename, EC, sys::fs::OF_None));
#endif #endif
if (EC) { if (EC) {
errs() << EC.message() << '\n'; errs() << EC.message() << '\n';

View File

@ -1690,7 +1690,7 @@ static void handleLibcall(StringRef name) {
// easily. // easily.
static void writeDependencyFile() { static void writeDependencyFile() {
std::error_code ec; std::error_code ec;
raw_fd_ostream os(config->dependencyFile, ec, sys::fs::F_None); raw_fd_ostream os(config->dependencyFile, ec, sys::fs::OF_None);
if (ec) { if (ec) {
error("cannot open " + config->dependencyFile + ": " + ec.message()); error("cannot open " + config->dependencyFile + ": " + ec.message());
return; return;

View File

@ -63,7 +63,7 @@ static void writeCFGToDotFile(Function &F, BlockFrequencyInfo *BFI,
errs() << "Writing '" << Filename << "'..."; errs() << "Writing '" << Filename << "'...";
std::error_code EC; std::error_code EC;
raw_fd_ostream File(Filename, EC, sys::fs::F_Text); raw_fd_ostream File(Filename, EC, sys::fs::OF_Text);
DOTFuncInfo CFGInfo(&F, BFI, BPI, MaxFreq); DOTFuncInfo CFGInfo(&F, BFI, BPI, MaxFreq);
CFGInfo.setHeatColors(ShowHeatColors); CFGInfo.setHeatColors(ShowHeatColors);

View File

@ -274,7 +274,7 @@ bool CallGraphDOTPrinter::runOnModule(Module &M) {
errs() << "Writing '" << Filename << "'..."; errs() << "Writing '" << Filename << "'...";
std::error_code EC; std::error_code EC;
raw_fd_ostream File(Filename, EC, sys::fs::F_Text); raw_fd_ostream File(Filename, EC, sys::fs::OF_Text);
CallGraph CG(M); CallGraph CG(M);
CallGraphDOTInfo CFGInfo(&M, &CG, LookupBFI); CallGraphDOTInfo CFGInfo(&M, &CG, LookupBFI);

View File

@ -42,7 +42,7 @@ static void writeDDGToDotFile(DataDependenceGraph &G, bool DOnly) {
errs() << "Writing '" << Filename << "'..."; errs() << "Writing '" << Filename << "'...";
std::error_code EC; std::error_code EC;
raw_fd_ostream File(Filename, EC, sys::fs::F_Text); raw_fd_ostream File(Filename, EC, sys::fs::OF_Text);
if (!EC) if (!EC)
// We only provide the constant verson of the DOTGraphTrait specialization, // We only provide the constant verson of the DOTGraphTrait specialization,

View File

@ -96,7 +96,7 @@ static Triple GetTriple(StringRef ProgName, opt::InputArgList &Args) {
static std::unique_ptr<ToolOutputFile> GetOutputStream(StringRef Path) { static std::unique_ptr<ToolOutputFile> GetOutputStream(StringRef Path) {
std::error_code EC; std::error_code EC;
auto Out = std::make_unique<ToolOutputFile>(Path, EC, sys::fs::F_None); auto Out = std::make_unique<ToolOutputFile>(Path, EC, sys::fs::OF_None);
if (EC) { if (EC) {
WithColor::error() << EC.message() << '\n'; WithColor::error() << EC.message() << '\n';
return nullptr; return nullptr;

View File

@ -35,7 +35,7 @@ std::unique_ptr<llvm::ToolOutputFile>
mlir::openOutputFile(StringRef outputFilename, std::string *errorMessage) { mlir::openOutputFile(StringRef outputFilename, std::string *errorMessage) {
std::error_code error; std::error_code error;
auto result = std::make_unique<llvm::ToolOutputFile>(outputFilename, error, auto result = std::make_unique<llvm::ToolOutputFile>(outputFilename, error,
llvm::sys::fs::F_None); llvm::sys::fs::OF_None);
if (error) { if (error) {
if (errorMessage) if (errorMessage)
*errorMessage = "cannot open output file '" + outputFilename.str() + *errorMessage = "cannot open output file '" + outputFilename.str() +