1 files changed, 9 insertions, 9 deletions

diff --git a/contrib/llvm-project/lldb/source/Host/common/File.cpp b/contrib/llvm-project/lldb/source/Host/common/File.cpp
index ce5283a61375..15e7a211e353 100644
--- a/contrib/llvm-project/lldb/source/Host/common/File.cpp
+++ b/contrib/llvm-project/lldb/source/Host/common/File.cpp
@@ -13,6 +13,7 @@
 #include <cstdarg>
 #include <cstdio>
 #include <fcntl.h>
+#include <optional>
 
 #ifdef _WIN32
 #include "lldb/Host/windows/windows.h"
@@ -777,13 +778,13 @@ SerialPort::OptionsFromURL(llvm::StringRef urlqs) {
       serial_options.BaudRate = baud_rate;
     } else if (x.consume_front("parity=")) {
       serial_options.Parity =
-          llvm::StringSwitch<llvm::Optional<Terminal::Parity>>(x)
+          llvm::StringSwitch<std::optional<Terminal::Parity>>(x)
               .Case("no", Terminal::Parity::No)
               .Case("even", Terminal::Parity::Even)
               .Case("odd", Terminal::Parity::Odd)
               .Case("mark", Terminal::Parity::Mark)
               .Case("space", Terminal::Parity::Space)
-              .Default(llvm::None);
+              .Default(std::nullopt);
       if (!serial_options.Parity)
         return llvm::createStringError(
             llvm::inconvertibleErrorCode(),
@@ -791,14 +792,14 @@ SerialPort::OptionsFromURL(llvm::StringRef urlqs) {
             x.str().c_str());
     } else if (x.consume_front("parity-check=")) {
       serial_options.ParityCheck =
-          llvm::StringSwitch<llvm::Optional<Terminal::ParityCheck>>(x)
+          llvm::StringSwitch<std::optional<Terminal::ParityCheck>>(x)
               .Case("no", Terminal::ParityCheck::No)
               .Case("replace", Terminal::ParityCheck::ReplaceWithNUL)
               .Case("ignore", Terminal::ParityCheck::Ignore)
               // "mark" mode is not currently supported as it requires special
               // input processing
               // .Case("mark", Terminal::ParityCheck::Mark)
-              .Default(llvm::None);
+              .Default(std::nullopt);
       if (!serial_options.ParityCheck)
         return llvm::createStringError(
             llvm::inconvertibleErrorCode(),
@@ -833,20 +834,19 @@ SerialPort::Create(int fd, OpenOptions options, Options serial_options,
   if (llvm::Error error = term.SetRaw())
     return std::move(error);
   if (serial_options.BaudRate) {
-    if (llvm::Error error = term.SetBaudRate(serial_options.BaudRate.value()))
+    if (llvm::Error error = term.SetBaudRate(*serial_options.BaudRate))
       return std::move(error);
   }
   if (serial_options.Parity) {
-    if (llvm::Error error = term.SetParity(serial_options.Parity.value()))
+    if (llvm::Error error = term.SetParity(*serial_options.Parity))
       return std::move(error);
   }
   if (serial_options.ParityCheck) {
-    if (llvm::Error error =
-            term.SetParityCheck(serial_options.ParityCheck.value()))
+    if (llvm::Error error = term.SetParityCheck(*serial_options.ParityCheck))
       return std::move(error);
   }
   if (serial_options.StopBits) {
-    if (llvm::Error error = term.SetStopBits(serial_options.StopBits.value()))
+    if (llvm::Error error = term.SetStopBits(*serial_options.StopBits))
       return std::move(error);
   }