Replace llvm::Optional, llvm::None with their std equivalents

root-project · Dec 13, 2023 · 879eed2 · 879eed2
1 parent cf51c60
commit 879eed2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/include/cling/MetaProcessor/MetaSema.h b/include/cling/MetaProcessor/MetaSema.h
@@ -16,7 +16,7 @@
 #include "clang/Basic/FileManager.h" // for DenseMap<FileEntry*>
 
 #include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/Optional.h"
+#include <optional>
 
 namespace llvm {
   class StringRef;
@@ -153,7 +153,7 @@ namespace cling {
     ///
     ///\param[in] mode - either on/off or toggle.
     ///
-    void actOndebugCommand(llvm::Optional<int> mode) const;
+    void actOndebugCommand(std::optional<int> mode) const;
 
     ///\brief Prints out the the Debug information of the state changes.
     ///

diff --git a/lib/Interpreter/IncrementalCUDADeviceCompiler.cpp b/lib/Interpreter/IncrementalCUDADeviceCompiler.cpp
@@ -27,6 +27,7 @@
 
 #include <algorithm>
 #include <bitset>
+#include <optional>
 #include <string>
 #include <system_error>
 
@@ -292,8 +293,8 @@ namespace cling {
     }
 
     // is not important, because PTX does not use any object format
-    llvm::Optional<llvm::Reloc::Model> RM =
-        llvm::Optional<llvm::Reloc::Model>(llvm::Reloc::Model::PIC_);
+    std::optional<llvm::Reloc::Model> RM =
+        std::optional<llvm::Reloc::Model>(llvm::Reloc::Model::PIC_);
 
     llvm::TargetOptions TO = llvm::TargetOptions();
 

diff --git a/lib/Interpreter/IncrementalJIT.cpp b/lib/Interpreter/IncrementalJIT.cpp
@@ -31,6 +31,8 @@
 #include <llvm/Support/Host.h>
 #include <llvm/Target/TargetMachine.h>
 
+#include <optional>
+
 #ifdef __linux__
 #include <sys/stat.h>
 #endif
@@ -683,7 +685,7 @@ void* IncrementalJIT::getSymbolAddress(StringRef Name, bool IncludeHostSymbols){
   if (!IncludeHostSymbols)
     G.lock();
 
-  std::pair<llvm::StringMapIterator<llvm::NoneType>, bool> insertInfo;
+  std::pair<llvm::StringMapIterator<std::nullopt_t>, bool> insertInfo;
   if (!IncludeHostSymbols)
     insertInfo = m_ForbidDlSymbols.insert(Name);
 

diff --git a/lib/Interpreter/InterpreterCallbacks.cpp b/lib/Interpreter/InterpreterCallbacks.cpp
@@ -21,6 +21,8 @@
 #include "clang/Serialization/ASTDeserializationListener.h"
 #include "clang/Serialization/ASTReader.h"
 
+#include <optional>
+
 using namespace clang;
 
 namespace cling {
@@ -154,7 +156,7 @@ namespace cling {
       return m_Source->getModule(ID);
     }
 
-    virtual llvm::Optional<ASTSourceDescriptor>
+    virtual std::optional<ASTSourceDescriptor>
     getSourceDescriptor(unsigned ID) override {
       return m_Source->getSourceDescriptor(ID);
     }

diff --git a/lib/MetaProcessor/MetaParser.cpp b/lib/MetaProcessor/MetaParser.cpp
@@ -18,10 +18,11 @@
 #include "cling/Utils/Output.h"
 #include "cling/Utils/Paths.h"
 
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Path.h"
 
+#include <optional>
+
 namespace cling {
 
   MetaParser::MetaParser(MetaSema &Actions, llvm::StringRef Line) :
@@ -433,7 +434,7 @@ namespace cling {
   bool MetaParser::isdebugCommand() {
     if (getCurTok().is(tok::ident) &&
         getCurTok().getIdent().equals("debug")) {
-      llvm::Optional<int> mode;
+      std::optional<int> mode;
       consumeToken();
       skipWhitespace();
       if (getCurTok().is(tok::constant))

diff --git a/lib/MetaProcessor/MetaSema.cpp b/lib/MetaProcessor/MetaSema.cpp
@@ -250,7 +250,7 @@ namespace cling {
       m_Interpreter.enableRawInput(mode);
   }
 
-  void MetaSema::actOndebugCommand(llvm::Optional<int> mode) const {
+  void MetaSema::actOndebugCommand(std::optional<int> mode) const {
     constexpr clang::codegenoptions::DebugInfoKind DebugInfo[] = {
       clang::codegenoptions::NoDebugInfo,
       clang::codegenoptions::LocTrackingOnly,