From 49e75ebd854dee1fcf5729c264f4cfadf76e952d Mon Sep 17 00:00:00 2001 From: Krzysztof Parzyszek Date: Wed, 7 Dec 2022 10:04:25 -0800 Subject: [Bitcode(Reader|Writer)] Convert Optional to std::optional --- llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'llvm/lib/Bitcode/Reader/BitcodeReader.cpp') diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index b5f1851..efc8b22 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -13,7 +13,6 @@ #include "llvm/ADT/APInt.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/DenseMap.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallVector.h" @@ -3717,11 +3716,11 @@ Error BitcodeReader::rememberAndSkipFunctionBodies() { } Error BitcodeReaderBase::readBlockInfo() { - Expected> MaybeNewBlockInfo = + Expected> MaybeNewBlockInfo = Stream.ReadBlockInfoBlock(); if (!MaybeNewBlockInfo) return MaybeNewBlockInfo.takeError(); - Optional NewBlockInfo = + std::optional NewBlockInfo = std::move(MaybeNewBlockInfo.get()); if (!NewBlockInfo) return error("Malformed block"); -- cgit v1.1