diff options
Diffstat (limited to 'clang/lib/Frontend/SerializedDiagnosticReader.cpp')
| -rw-r--r-- | clang/lib/Frontend/SerializedDiagnosticReader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Frontend/SerializedDiagnosticReader.cpp b/clang/lib/Frontend/SerializedDiagnosticReader.cpp index eca6f5ee1803..5f5ed41b0462 100644 --- a/clang/lib/Frontend/SerializedDiagnosticReader.cpp +++ b/clang/lib/Frontend/SerializedDiagnosticReader.cpp @@ -10,7 +10,6 @@ #include "clang/Basic/FileManager.h" #include "clang/Basic/FileSystemOptions.h" #include "clang/Frontend/SerializedDiagnostics.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" #include "llvm/Bitstream/BitCodes.h" @@ -20,6 +19,7 @@ #include "llvm/Support/ErrorOr.h" #include "llvm/Support/ManagedStatic.h" #include <cstdint> +#include <optional> #include <system_error> using namespace clang; @@ -35,7 +35,7 @@ std::error_code SerializedDiagnosticReader::readDiagnostics(StringRef File) { return SDError::CouldNotLoad; llvm::BitstreamCursor Stream(**Buffer); - Optional<llvm::BitstreamBlockInfo> BlockInfo; + std::optional<llvm::BitstreamBlockInfo> BlockInfo; if (Stream.AtEndOfStream()) return SDError::InvalidSignature; @@ -73,7 +73,7 @@ std::error_code SerializedDiagnosticReader::readDiagnostics(StringRef File) { switch (MaybeSubBlockID.get()) { case llvm::bitc::BLOCKINFO_BLOCK_ID: { - Expected<Optional<llvm::BitstreamBlockInfo>> MaybeBlockInfo = + Expected<std::optional<llvm::BitstreamBlockInfo>> MaybeBlockInfo = Stream.ReadBlockInfoBlock(); if (!MaybeBlockInfo) { // FIXME this drops the error on the floor. @@ -184,7 +184,7 @@ SerializedDiagnosticReader::readMetaBlock(llvm::BitstreamCursor &Stream) { consumeError(std::move(Err)); return SDError::MalformedMetadataBlock; } - LLVM_FALLTHROUGH; + [[fallthrough]]; case Cursor::BlockEnd: if (!VersionChecked) return SDError::MissingVersion; |