Merge pull request #8120 from bnbarham/std-optional-all-the-things

Migrate remaining llvm::Optional to std::optional

Author: bnbarham

clang/include/clang/Basic/PointerAuthOptions.h

@@ -15,10 +15,10 @@
 #define LLVM_CLANG_BASIC_POINTERAUTHOPTIONS_H
 
 #include "clang/Basic/LLVM.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/Target/TargetOptions.h"
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
 #include <vector>
 #include "llvm/Support/ErrorHandling.h"

clang/include/clang/Tooling/Refactor/RefactoringOperation.h

@@ -15,8 +15,8 @@
 #include "clang/Tooling/Refactor/RefactoringOptionSet.h"
 #include "clang/Tooling/Refactor/RefactoringReplacement.h"
 #include "clang/Tooling/Refactor/SymbolOperation.h"
-#include "llvm/ADT/None.h"
 #include "llvm/Support/Error.h"
+#include <optional>
 #include <string>
 #include <vector>
 

clang/lib/Tooling/Refactor/RefactoringContinuations.h

@@ -266,9 +266,9 @@ class SpecificRefactoringContinuation final : public RefactoringContinuation {
   ConsumerFn Consumer;
   std::unique_ptr<ASTQueryType> ASTQuery;
   /// Inputs store state that's dependent on the original TU.
-  llvm::Optional<std::tuple<QueryOrState...>> Inputs;
+  std::optional<std::tuple<QueryOrState...>> Inputs;
   /// State contains TU-independent values.
-  llvm::Optional<
+  std::optional<
       std::tuple<typename StateTraits<QueryOrState>::PersistentType...>>
       State;
 

clang/tools/IndexStore/IndexStore.cpp

@@ -19,7 +19,6 @@
 #include "clang/Index/IndexUnitWriter.h"
 #include "clang/DirectoryWatcher/DirectoryWatcher.h"
 #include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/Chrono.h"
 #include "llvm/Support/ManagedStatic.h"

clang/tools/c-index-test/core_main.cpp

@@ -486,7 +486,7 @@ static std::string findRecordNameForFile(indexstore::IndexStore &store,
 }
 
 static int printStoreFileRecord(StringRef storePath, StringRef filePath,
-                                Optional<unsigned> lineStart, unsigned lineCount,
+                                std::optional<unsigned> lineStart, unsigned lineCount,
                                 PathRemapper remapper, raw_ostream &OS) {
   std::string error;
   indexstore::IndexStore store(storePath, remapper, error);
@@ -698,7 +698,7 @@ static int scanDeps(ArrayRef<const char *> Args, std::string WorkingDirectory,
                     bool SerializeDiags, bool DependencyFile,
                     ArrayRef<std::string> DepTargets, std::string OutputPath,
                     CXCASDatabases DBs,
-                    Optional<std::string> ModuleName = std::nullopt) {
+                    std::optional<std::string> ModuleName = std::nullopt) {
   CXDependencyScannerServiceOptions Opts =
       clang_experimental_DependencyScannerServiceOptions_create();
   auto CleanupOpts = llvm::make_scope_exit([&] {
@@ -1193,7 +1193,7 @@ static int watchDirectory(StringRef dirPath) {
 
 bool deconstructPathAndRange(StringRef input,
                              std::string &filepath,
-                             Optional<unsigned> &lineStart,
+                             std::optional<unsigned> &lineStart,
                              unsigned &lineCount) {
   StringRef path, start, end;
   std::tie(path, end) = input.rsplit(':');
@@ -1272,7 +1272,7 @@ int indextest_core_main(int argc, const char **argv) {
   if (options::Action == ActionType::PrintRecord) {
     if (!options::FilePathAndRange.empty()) {
       std::string filepath;
-      Optional<unsigned> lineStart;
+      std::optional<unsigned> lineStart;
       unsigned lineCount;
       if (deconstructPathAndRange(options::FilePathAndRange,
                                   filepath, lineStart, lineCount))
@@ -1330,9 +1330,9 @@ int indextest_core_main(int argc, const char **argv) {
     return aggregateDataAsJSON(storePath, PathRemapper, OS);
   }
 
-  Optional<std::string> CASPath = options::CASPath.empty()
+  std::optional<std::string> CASPath = options::CASPath.empty()
                                       ? std::nullopt
-                                      : Optional<std::string>(options::CASPath);
+                                      : std::optional<std::string>(options::CASPath);
 
   CXCASOptions CASOpts = nullptr;
   CXCASDatabases DBs = nullptr;

clang/tools/libclang/CIndexDiagnostic.h

@@ -16,7 +16,6 @@
 #include "clang-c/Index.h"
 #include "clang/Basic/LLVM.h"
 #include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringRef.h"
 #include <assert.h>
 #include <memory>

lldb/include/lldb/Core/Module.h

@@ -31,7 +31,7 @@
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/STLFunctionalExtras.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Optional.h"
+#include <optional>
 #include "llvm/Support/Chrono.h"
 
 #include <atomic>
@@ -820,7 +820,7 @@ class Module : public std::enable_shared_from_this<Module>,
 #ifdef LLDB_ENABLE_SWIFT
   void
   ReportWarningToolchainMismatch(CompileUnit &comp_unit,
-                                 llvm::Optional<lldb::user_id_t> debugger_id);
+                                 std::optional<lldb::user_id_t> debugger_id);
 
   bool IsSwiftCxxInteropEnabled();
 #endif

lldb/include/lldb/Core/ValueObject.h

@@ -589,7 +589,7 @@ class ValueObject {
   virtual bool HasSyntheticValue();
 
 #ifdef LLDB_ENABLE_SWIFT
-  llvm::Optional<SwiftScratchContextReader> GetSwiftScratchContext();
+  std::optional<SwiftScratchContextReader> GetSwiftScratchContext();
 #endif // LLDB_ENABLE_SWIFT
 
   virtual bool IsSynthetic() { return false; }

lldb/include/lldb/Target/Target.h

@@ -45,7 +45,7 @@
 #include "lldb/Utility/Timeout.h"
 #include "lldb/lldb-public.h"
 
-#include "llvm/ADT/Optional.h"
+#include <optional>
 
 namespace lldb_private {
 
@@ -1281,7 +1281,7 @@ class Target : public std::enable_shared_from_this<Target>,
     return m_scratch_typesystem_lock;
   }
 
-  llvm::Optional<SwiftScratchContextReader>
+  std::optional<SwiftScratchContextReader>
   GetSwiftScratchContext(Status &error, ExecutionContextScope &exe_scope,
                          bool create_on_demand = true);
 

lldb/include/lldb/Utility/Either.h

@@ -9,7 +9,7 @@
 #ifndef liblldb_Either_h_
 #define liblldb_Either_h_
 
-#include "llvm/ADT/Optional.h"
+#include <optional>
 
 #include <functional>
 
@@ -51,23 +51,23 @@ template <typename T1, typename T2> class Either {
 
   template <class X, typename std::enable_if<std::is_same<T1, X>::value>::type
                          * = nullptr>
-  llvm::Optional<T1> GetAs() const {
+  std::optional<T1> GetAs() const {
     switch (m_selected) {
     case Selected::One:
       return m_t1;
     default:
-      return llvm::Optional<T1>();
+      return std::optional<T1>();
     }
   }
 
   template <class X, typename std::enable_if<std::is_same<T2, X>::value>::type
                          * = nullptr>
-  llvm::Optional<T2> GetAs() const {
+  std::optional<T2> GetAs() const {
     switch (m_selected) {
     case Selected::Two:
       return m_t2;
     default:
-      return llvm::Optional<T2>();
+      return std::optional<T2>();
     }
   }