diff options
author | Krzysztof Parzyszek <kparzysz@quicinc.com> | 2022-12-06 19:51:30 -0600 |
---|---|---|
committer | Krzysztof Parzyszek <kparzysz@quicinc.com> | 2022-12-07 08:11:11 -0600 |
commit | a81a0c97f1a0016686fdc5c5d10644fa2628b376 (patch) | |
tree | 362c404e8abd50d87406fe82a4a6c557843de733 /llvm/lib/Remarks | |
parent | bfe292b00fa32f05c810a6ace37bd8b51138a094 (diff) | |
download | llvm-a81a0c97f1a0016686fdc5c5d10644fa2628b376.zip llvm-a81a0c97f1a0016686fdc5c5d10644fa2628b376.tar.gz llvm-a81a0c97f1a0016686fdc5c5d10644fa2628b376.tar.bz2 |
[Remarks] Convert Optional to std::optional
Diffstat (limited to 'llvm/lib/Remarks')
-rw-r--r-- | llvm/lib/Remarks/BitstreamRemarkParser.cpp | 14 | ||||
-rw-r--r-- | llvm/lib/Remarks/BitstreamRemarkParser.h | 10 | ||||
-rw-r--r-- | llvm/lib/Remarks/BitstreamRemarkSerializer.cpp | 8 | ||||
-rw-r--r-- | llvm/lib/Remarks/RemarkLinker.cpp | 18 | ||||
-rw-r--r-- | llvm/lib/Remarks/RemarkParser.cpp | 4 | ||||
-rw-r--r-- | llvm/lib/Remarks/RemarkStreamer.cpp | 5 | ||||
-rw-r--r-- | llvm/lib/Remarks/YAMLRemarkParser.cpp | 9 | ||||
-rw-r--r-- | llvm/lib/Remarks/YAMLRemarkParser.h | 10 |
8 files changed, 41 insertions, 37 deletions
diff --git a/llvm/lib/Remarks/BitstreamRemarkParser.cpp b/llvm/lib/Remarks/BitstreamRemarkParser.cpp index 08b8386..85fe814 100644 --- a/llvm/lib/Remarks/BitstreamRemarkParser.cpp +++ b/llvm/lib/Remarks/BitstreamRemarkParser.cpp @@ -307,8 +307,8 @@ static Error advanceToMetaBlock(BitstreamParserHelper &Helper) { Expected<std::unique_ptr<BitstreamRemarkParser>> remarks::createBitstreamParserFromMeta( - StringRef Buf, Optional<ParsedStringTable> StrTab, - Optional<StringRef> ExternalFilePrependPath) { + StringRef Buf, std::optional<ParsedStringTable> StrTab, + std::optional<StringRef> ExternalFilePrependPath) { BitstreamParserHelper Helper(Buf); Expected<std::array<char, 4>> MagicNumber = Helper.parseMagic(); if (!MagicNumber) @@ -367,14 +367,14 @@ Error BitstreamRemarkParser::parseMeta() { Error BitstreamRemarkParser::processCommonMeta( BitstreamMetaParserHelper &Helper) { - if (Optional<uint64_t> Version = Helper.ContainerVersion) + if (std::optional<uint64_t> Version = Helper.ContainerVersion) ContainerVersion = *Version; else return createStringError( std::make_error_code(std::errc::illegal_byte_sequence), "Error while parsing BLOCK_META: missing container version."); - if (Optional<uint8_t> Type = Helper.ContainerType) { + if (std::optional<uint8_t> Type = Helper.ContainerType) { // Always >= BitstreamRemarkContainerType::First since it's unsigned. if (*Type > static_cast<uint8_t>(BitstreamRemarkContainerType::Last)) return createStringError( @@ -391,7 +391,7 @@ Error BitstreamRemarkParser::processCommonMeta( } static Error processStrTab(BitstreamRemarkParser &P, - Optional<StringRef> StrTabBuf) { + std::optional<StringRef> StrTabBuf) { if (!StrTabBuf) return createStringError( std::make_error_code(std::errc::illegal_byte_sequence), @@ -402,7 +402,7 @@ static Error processStrTab(BitstreamRemarkParser &P, } static Error processRemarkVersion(BitstreamRemarkParser &P, - Optional<uint64_t> RemarkVersion) { + std::optional<uint64_t> RemarkVersion) { if (!RemarkVersion) return createStringError( std::make_error_code(std::errc::illegal_byte_sequence), @@ -412,7 +412,7 @@ static Error processRemarkVersion(BitstreamRemarkParser &P, } Error BitstreamRemarkParser::processExternalFilePath( - Optional<StringRef> ExternalFilePath) { + std::optional<StringRef> ExternalFilePath) { if (!ExternalFilePath) return createStringError( std::make_error_code(std::errc::illegal_byte_sequence), diff --git a/llvm/lib/Remarks/BitstreamRemarkParser.h b/llvm/lib/Remarks/BitstreamRemarkParser.h index 78f18a6..fc786fc 100644 --- a/llvm/lib/Remarks/BitstreamRemarkParser.h +++ b/llvm/lib/Remarks/BitstreamRemarkParser.h @@ -13,13 +13,13 @@ #ifndef LLVM_LIB_REMARKS_BITSTREAM_REMARK_PARSER_H #define LLVM_LIB_REMARKS_BITSTREAM_REMARK_PARSER_H -#include "llvm/ADT/Optional.h" #include "llvm/Remarks/BitstreamRemarkContainer.h" #include "llvm/Remarks/BitstreamRemarkParser.h" #include "llvm/Remarks/RemarkFormat.h" #include "llvm/Remarks/RemarkParser.h" #include <cstdint> #include <memory> +#include <optional> namespace llvm { namespace remarks { @@ -31,7 +31,7 @@ struct BitstreamRemarkParser : public RemarkParser { /// The buffer to parse. BitstreamParserHelper ParserHelper; /// The string table used for parsing strings. - Optional<ParsedStringTable> StrTab; + std::optional<ParsedStringTable> StrTab; /// Temporary remark buffer used when the remarks are stored separately. std::unique_ptr<MemoryBuffer> TmpRemarkBuffer; /// The common metadata used to decide how to parse the buffer. @@ -73,12 +73,12 @@ private: Error processSeparateRemarksMetaMeta(BitstreamMetaParserHelper &Helper); Expected<std::unique_ptr<Remark>> processRemark(BitstreamRemarkParserHelper &Helper); - Error processExternalFilePath(Optional<StringRef> ExternalFilePath); + Error processExternalFilePath(std::optional<StringRef> ExternalFilePath); }; Expected<std::unique_ptr<BitstreamRemarkParser>> createBitstreamParserFromMeta( - StringRef Buf, Optional<ParsedStringTable> StrTab = std::nullopt, - Optional<StringRef> ExternalFilePrependPath = std::nullopt); + StringRef Buf, std::optional<ParsedStringTable> StrTab = std::nullopt, + std::optional<StringRef> ExternalFilePrependPath = std::nullopt); } // end namespace remarks } // end namespace llvm diff --git a/llvm/lib/Remarks/BitstreamRemarkSerializer.cpp b/llvm/lib/Remarks/BitstreamRemarkSerializer.cpp index 5428967..b262719 100644 --- a/llvm/lib/Remarks/BitstreamRemarkSerializer.cpp +++ b/llvm/lib/Remarks/BitstreamRemarkSerializer.cpp @@ -232,8 +232,9 @@ void BitstreamRemarkSerializerHelper::setupBlockInfo() { } void BitstreamRemarkSerializerHelper::emitMetaBlock( - uint64_t ContainerVersion, Optional<uint64_t> RemarkVersion, - Optional<const StringTable *> StrTab, std::optional<StringRef> Filename) { + uint64_t ContainerVersion, std::optional<uint64_t> RemarkVersion, + std::optional<const StringTable *> StrTab, + std::optional<StringRef> Filename) { // Emit the meta block Bitstream.EnterSubblock(META_BLOCK_ID, 3); @@ -354,7 +355,8 @@ void BitstreamRemarkSerializer::emit(const Remark &Remark) { Helper.ContainerType == BitstreamRemarkContainerType::Standalone; BitstreamMetaSerializer MetaSerializer( OS, Helper, - IsStandalone ? &*StrTab : Optional<const StringTable *>(std::nullopt)); + IsStandalone ? &*StrTab + : std::optional<const StringTable *>(std::nullopt)); MetaSerializer.emit(); DidSetUp = true; } diff --git a/llvm/lib/Remarks/RemarkLinker.cpp b/llvm/lib/Remarks/RemarkLinker.cpp index d21bcb1..74acb08 100644 --- a/llvm/lib/Remarks/RemarkLinker.cpp +++ b/llvm/lib/Remarks/RemarkLinker.cpp @@ -17,6 +17,7 @@ #include "llvm/Remarks/RemarkParser.h" #include "llvm/Remarks/RemarkSerializer.h" #include "llvm/Support/Error.h" +#include <optional> using namespace llvm; using namespace llvm::remarks; @@ -34,7 +35,7 @@ getRemarksSectionName(const object::ObjectFile &Obj) { "Unsupported file format."); } -Expected<Optional<StringRef>> +Expected<std::optional<StringRef>> llvm::remarks::getRemarksSectionContents(const object::ObjectFile &Obj) { Expected<StringRef> SectionName = getRemarksSectionName(Obj); if (!SectionName) @@ -52,7 +53,7 @@ llvm::remarks::getRemarksSectionContents(const object::ObjectFile &Obj) { else return Contents.takeError(); } - return Optional<StringRef>{}; + return std::optional<StringRef>{}; } Remark &RemarkLinker::keep(std::unique_ptr<Remark> Remark) { @@ -68,7 +69,7 @@ void RemarkLinker::setExternalFilePrependPath(StringRef PrependPathIn) { // Discard remarks with no source location. static bool shouldKeepRemark(const Remark &R) { return R.Loc.has_value(); } -Error RemarkLinker::link(StringRef Buffer, Optional<Format> RemarkFormat) { +Error RemarkLinker::link(StringRef Buffer, std::optional<Format> RemarkFormat) { if (!RemarkFormat) { Expected<Format> ParserFormat = magicToFormat(Buffer); if (!ParserFormat) @@ -79,8 +80,8 @@ Error RemarkLinker::link(StringRef Buffer, Optional<Format> RemarkFormat) { Expected<std::unique_ptr<RemarkParser>> MaybeParser = createRemarkParserFromMeta( *RemarkFormat, Buffer, /*StrTab=*/std::nullopt, - PrependPath ? Optional<StringRef>(StringRef(*PrependPath)) - : Optional<StringRef>()); + PrependPath ? std::optional<StringRef>(StringRef(*PrependPath)) + : std::optional<StringRef>()); if (!MaybeParser) return MaybeParser.takeError(); @@ -105,12 +106,13 @@ Error RemarkLinker::link(StringRef Buffer, Optional<Format> RemarkFormat) { } Error RemarkLinker::link(const object::ObjectFile &Obj, - Optional<Format> RemarkFormat) { - Expected<Optional<StringRef>> SectionOrErr = getRemarksSectionContents(Obj); + std::optional<Format> RemarkFormat) { + Expected<std::optional<StringRef>> SectionOrErr = + getRemarksSectionContents(Obj); if (!SectionOrErr) return SectionOrErr.takeError(); - if (Optional<StringRef> Section = *SectionOrErr) + if (std::optional<StringRef> Section = *SectionOrErr) return link(*Section, RemarkFormat); return Error::success(); } diff --git a/llvm/lib/Remarks/RemarkParser.cpp b/llvm/lib/Remarks/RemarkParser.cpp index 67ec0b0..7fccb94 100644 --- a/llvm/lib/Remarks/RemarkParser.cpp +++ b/llvm/lib/Remarks/RemarkParser.cpp @@ -87,8 +87,8 @@ llvm::remarks::createRemarkParser(Format ParserFormat, StringRef Buf, Expected<std::unique_ptr<RemarkParser>> llvm::remarks::createRemarkParserFromMeta( - Format ParserFormat, StringRef Buf, Optional<ParsedStringTable> StrTab, - Optional<StringRef> ExternalFilePrependPath) { + Format ParserFormat, StringRef Buf, std::optional<ParsedStringTable> StrTab, + std::optional<StringRef> ExternalFilePrependPath) { switch (ParserFormat) { // Depending on the metadata, the format can be either yaml or yaml-strtab, // regardless of the input argument. diff --git a/llvm/lib/Remarks/RemarkStreamer.cpp b/llvm/lib/Remarks/RemarkStreamer.cpp index 8ad2ce6..9f4676c 100644 --- a/llvm/lib/Remarks/RemarkStreamer.cpp +++ b/llvm/lib/Remarks/RemarkStreamer.cpp @@ -12,6 +12,7 @@ #include "llvm/Remarks/RemarkStreamer.h" #include "llvm/Support/CommandLine.h" +#include <optional> using namespace llvm; using namespace llvm::remarks; @@ -25,9 +26,9 @@ static cl::opt<cl::boolOrDefault> EnableRemarksSection( RemarkStreamer::RemarkStreamer( std::unique_ptr<remarks::RemarkSerializer> RemarkSerializer, - Optional<StringRef> FilenameIn) + std::optional<StringRef> FilenameIn) : RemarkSerializer(std::move(RemarkSerializer)), - Filename(FilenameIn ? Optional<std::string>(FilenameIn->str()) + Filename(FilenameIn ? std::optional<std::string>(FilenameIn->str()) : std::nullopt) {} Error RemarkStreamer::setFilter(StringRef Filter) { diff --git a/llvm/lib/Remarks/YAMLRemarkParser.cpp b/llvm/lib/Remarks/YAMLRemarkParser.cpp index 265371c..4996ab6 100644 --- a/llvm/lib/Remarks/YAMLRemarkParser.cpp +++ b/llvm/lib/Remarks/YAMLRemarkParser.cpp @@ -108,10 +108,9 @@ static Expected<ParsedStringTable> parseStrTab(StringRef &Buf, return Expected<ParsedStringTable>(std::move(Result)); } -Expected<std::unique_ptr<YAMLRemarkParser>> -remarks::createYAMLParserFromMeta(StringRef Buf, - Optional<ParsedStringTable> StrTab, - Optional<StringRef> ExternalFilePrependPath) { +Expected<std::unique_ptr<YAMLRemarkParser>> remarks::createYAMLParserFromMeta( + StringRef Buf, std::optional<ParsedStringTable> StrTab, + std::optional<StringRef> ExternalFilePrependPath) { // We now have a magic number. The metadata has to be correct. Expected<bool> isMeta = parseMagic(Buf); if (!isMeta) @@ -171,7 +170,7 @@ YAMLRemarkParser::YAMLRemarkParser(StringRef Buf) : YAMLRemarkParser(Buf, std::nullopt) {} YAMLRemarkParser::YAMLRemarkParser(StringRef Buf, - Optional<ParsedStringTable> StrTab) + std::optional<ParsedStringTable> StrTab) : RemarkParser{Format::YAML}, StrTab(std::move(StrTab)), SM(setupSM(LastErrorMessage)), Stream(Buf, SM), YAMLIt(Stream.begin()) {} diff --git a/llvm/lib/Remarks/YAMLRemarkParser.h b/llvm/lib/Remarks/YAMLRemarkParser.h index 44425e8..8ef72e1 100644 --- a/llvm/lib/Remarks/YAMLRemarkParser.h +++ b/llvm/lib/Remarks/YAMLRemarkParser.h @@ -13,7 +13,6 @@ #ifndef LLVM_REMARKS_YAML_REMARK_PARSER_H #define LLVM_REMARKS_YAML_REMARK_PARSER_H -#include "llvm/ADT/Optional.h" #include "llvm/Remarks/Remark.h" #include "llvm/Remarks/RemarkParser.h" #include "llvm/Support/Error.h" @@ -21,6 +20,7 @@ #include "llvm/Support/SourceMgr.h" #include "llvm/Support/YAMLParser.h" #include "llvm/Support/raw_ostream.h" +#include <optional> #include <string> namespace llvm { @@ -47,7 +47,7 @@ private: /// Regular YAML to Remark parser. struct YAMLRemarkParser : public RemarkParser { /// The string table used for parsing strings. - Optional<ParsedStringTable> StrTab; + std::optional<ParsedStringTable> StrTab; /// Last error message that can come from the YAML parser diagnostics. /// We need this for catching errors in the constructor. std::string LastErrorMessage; @@ -70,7 +70,7 @@ struct YAMLRemarkParser : public RemarkParser { } protected: - YAMLRemarkParser(StringRef Buf, Optional<ParsedStringTable> StrTab); + YAMLRemarkParser(StringRef Buf, std::optional<ParsedStringTable> StrTab); /// Create a YAMLParseError error from an existing error generated by the YAML /// parser. /// If there is no error, this returns Success. @@ -108,8 +108,8 @@ protected: }; Expected<std::unique_ptr<YAMLRemarkParser>> createYAMLParserFromMeta( - StringRef Buf, Optional<ParsedStringTable> StrTab = std::nullopt, - Optional<StringRef> ExternalFilePrependPath = std::nullopt); + StringRef Buf, std::optional<ParsedStringTable> StrTab = std::nullopt, + std::optional<StringRef> ExternalFilePrependPath = std::nullopt); } // end namespace remarks } // end namespace llvm |