diff --git a/lib/Basic/Statistic.cpp b/lib/Basic/Statistic.cpp
index b44fb5ec9d3..08451423165 100644
--- a/lib/Basic/Statistic.cpp
+++ b/lib/Basic/Statistic.cpp
@@ -251,7 +251,7 @@ public:
     SmallString<256> Path(Dirname);
     llvm::sys::path::append(Path, Filename);
     std::error_code EC;
-    raw_fd_ostream Stream(Path, EC, fs::F_Append | fs::F_Text);
+    raw_fd_ostream Stream(Path, EC, fs::OF_Append | fs::OF_Text);
     if (EC) {
       llvm::errs() << "Error opening profile file '"
                    << Path << "' for writing\n";
@@ -688,7 +688,7 @@ UnifiedStatsReporter::~UnifiedStatsReporter()
   }
 
   std::error_code EC;
-  raw_fd_ostream ostream(StatsFilename, EC, fs::F_Append | fs::F_Text);
+  raw_fd_ostream ostream(StatsFilename, EC, fs::OF_Append | fs::OF_Text);
   if (EC) {
     llvm::errs() << "Error opening -stats-output-dir file '"
                  << StatsFilename << "' for writing\n";
@@ -726,7 +726,7 @@ UnifiedStatsReporter::flushTracesAndProfiles() {
 
   if (FrontendStatsEvents && SourceMgr) {
     std::error_code EC;
-    raw_fd_ostream tstream(TraceFilename, EC, fs::F_Append | fs::F_Text);
+    raw_fd_ostream tstream(TraceFilename, EC, fs::OF_Append | fs::OF_Text);
     if (EC) {
       llvm::errs() << "Error opening -trace-stats-events file '"
                    << TraceFilename << "' for writing\n";
diff --git a/lib/FrontendTool/LoadedModuleTrace.cpp b/lib/FrontendTool/LoadedModuleTrace.cpp
index 7ec8fd1bd66..99cce3da176 100644
--- a/lib/FrontendTool/LoadedModuleTrace.cpp
+++ b/lib/FrontendTool/LoadedModuleTrace.cpp
@@ -707,7 +707,7 @@ bool swift::emitLoadedModuleTraceIfNeeded(ModuleDecl *mainModule,
   if (loadedModuleTracePath.empty())
     return false;
   std::error_code EC;
-  llvm::raw_fd_ostream out(loadedModuleTracePath, EC, llvm::sys::fs::F_Append);
+  llvm::raw_fd_ostream out(loadedModuleTracePath, EC, llvm::sys::fs::OF_Append);
 
   if (out.has_error() || EC) {
     ctxt.Diags.diagnose(SourceLoc(), diag::error_opening_output,
diff --git a/lib/Migrator/MigrationState.cpp b/lib/Migrator/MigrationState.cpp
index 5493a29f474..8128e61646b 100644
--- a/lib/Migrator/MigrationState.cpp
+++ b/lib/Migrator/MigrationState.cpp
@@ -35,7 +35,7 @@ std::string MigrationState::getOutputText() const {
 static bool quickDumpText(StringRef OutFilename, StringRef Text) {
   std::error_code Error;
   llvm::raw_fd_ostream FileOS(OutFilename,
-                              Error, llvm::sys::fs::F_Text);
+                              Error, llvm::sys::fs::OF_Text);
   if (FileOS.has_error()) {
     return true;
   }
diff --git a/lib/Migrator/Migrator.cpp b/lib/Migrator/Migrator.cpp
index baf7ae64c28..b183c74c6aa 100644
--- a/lib/Migrator/Migrator.cpp
+++ b/lib/Migrator/Migrator.cpp
@@ -385,7 +385,7 @@ bool Migrator::emitRemap() const {
 
   std::error_code Error;
   llvm::raw_fd_ostream FileOS(RemapPath,
-                              Error, llvm::sys::fs::F_Text);
+                              Error, llvm::sys::fs::OF_Text);
   if (FileOS.has_error()) {
     return true;
   }
@@ -406,7 +406,7 @@ bool Migrator::emitMigratedFile() const {
 
   std::error_code Error;
   llvm::raw_fd_ostream FileOS(OutFilename,
-                              Error, llvm::sys::fs::F_Text);
+                              Error, llvm::sys::fs::OF_Text);
   if (FileOS.has_error()) {
     return true;
   }
diff --git a/lib/SILOptimizer/Analysis/CallerAnalysis.cpp b/lib/SILOptimizer/Analysis/CallerAnalysis.cpp
index f27316bd95e..738d08ab792 100644
--- a/lib/SILOptimizer/Analysis/CallerAnalysis.cpp
+++ b/lib/SILOptimizer/Analysis/CallerAnalysis.cpp
@@ -447,7 +447,7 @@ void CallerAnalysis::dump() const { print(llvm::errs()); }
 void CallerAnalysis::print(const char *filePath) const {
   using namespace llvm::sys;
   std::error_code error;
-  llvm::raw_fd_ostream fileOutputStream(filePath, error, fs::F_Text);
+  llvm::raw_fd_ostream fileOutputStream(filePath, error, fs::OF_Text);
   if (error) {
     llvm::errs() << "Failed to open path \"" << filePath << "\" for writing.!";
     llvm_unreachable("default error handler");
diff --git a/lib/SILOptimizer/Utils/OptimizerStatsUtils.cpp b/lib/SILOptimizer/Utils/OptimizerStatsUtils.cpp
index 4e6d8a114ea..95a78ba10bb 100644
--- a/lib/SILOptimizer/Utils/OptimizerStatsUtils.cpp
+++ b/lib/SILOptimizer/Utils/OptimizerStatsUtils.cpp
@@ -558,7 +558,7 @@ llvm::raw_ostream &stats_os() {
       // Try to open the file.
       std::error_code EC;
       auto fd_stream = std::make_unique<llvm::raw_fd_ostream>(
-          SILStatsOutputFile, EC, llvm::sys::fs::OpenFlags::F_Text);
+          SILStatsOutputFile, EC, llvm::sys::fs::OpenFlags::OF_Text);
       if (!fd_stream->has_error() && !EC) {
         stats_output_stream = {fd_stream.release(),
                                [](llvm::raw_ostream *d) { delete d; }};