Author: Kazu Hirata Date: 2022-12-09T23:12:19-08:00 New Revision: e90e8487dce37ace5cfabb5b27cb0dc0ba5b566f
URL: https://github.com/llvm/llvm-project/commit/e90e8487dce37ace5cfabb5b27cb0dc0ba5b566f DIFF: https://github.com/llvm/llvm-project/commit/e90e8487dce37ace5cfabb5b27cb0dc0ba5b566f.diff LOG: [Frontend] Use std::optional in ASTUnit.cpp (NFC) This is part of an effort to migrate from llvm::Optional to std::optional: https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716 Added: Modified: clang/lib/Frontend/ASTUnit.cpp Removed: ################################################################################ diff --git a/clang/lib/Frontend/ASTUnit.cpp b/clang/lib/Frontend/ASTUnit.cpp index c133746734704..f5d4b56bca027 100644 --- a/clang/lib/Frontend/ASTUnit.cpp +++ b/clang/lib/Frontend/ASTUnit.cpp @@ -99,6 +99,7 @@ #include <cstdlib> #include <memory> #include <mutex> +#include <optional> #include <string> #include <tuple> #include <utility> @@ -734,7 +735,7 @@ void FilterAndStoreDiagnosticConsumer::HandleDiagnostic( } if (StandaloneDiags) { - llvm::Optional<StoredDiagnostic> StoredDiag; + std::optional<StoredDiagnostic> StoredDiag; if (!ResultDiag) { StoredDiag.emplace(Level, Info); ResultDiag = &*StoredDiag; @@ -1378,7 +1379,7 @@ ASTUnit::getMainBufferWithPrecompiledPreamble( SmallVector<StoredDiagnostic, 4> NewPreambleDiags; ASTUnitPreambleCallbacks Callbacks; { - llvm::Optional<CaptureDroppedDiagnostics> Capture; + std::optional<CaptureDroppedDiagnostics> Capture; if (CaptureDiagnostics != CaptureDiagsKind::None) Capture.emplace(CaptureDiagnostics, *Diagnostics, &NewPreambleDiags, &NewPreambleDiagsStandalone); @@ -2243,7 +2244,7 @@ void ASTUnit::CodeComplete( Clang->setCodeCompletionConsumer(AugmentedConsumer); auto getUniqueID = - [&FileMgr](StringRef Filename) -> Optional<llvm::sys::fs::UniqueID> { + [&FileMgr](StringRef Filename) -> std::optional<llvm::sys::fs::UniqueID> { if (auto Status = FileMgr.getVirtualFileSystem().status(Filename)) return Status->getUniqueID(); return std::nullopt; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
