diff options
Diffstat (limited to 'contrib/llvm-project/llvm/tools/llvm-pdbutil/BytesOutputStyle.cpp')
| -rw-r--r-- | contrib/llvm-project/llvm/tools/llvm-pdbutil/BytesOutputStyle.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/llvm-project/llvm/tools/llvm-pdbutil/BytesOutputStyle.cpp b/contrib/llvm-project/llvm/tools/llvm-pdbutil/BytesOutputStyle.cpp index ffc907e09f11..4c851e14a12d 100644 --- a/contrib/llvm-project/llvm/tools/llvm-pdbutil/BytesOutputStyle.cpp +++ b/contrib/llvm-project/llvm/tools/llvm-pdbutil/BytesOutputStyle.cpp @@ -8,7 +8,6 @@ #include "BytesOutputStyle.h" -#include "FormatUtil.h" #include "StreamUtil.h" #include "llvm-pdbutil.h" @@ -17,6 +16,7 @@ #include "llvm/DebugInfo/MSF/MSFCommon.h" #include "llvm/DebugInfo/MSF/MappedBlockStream.h" #include "llvm/DebugInfo/PDB/Native/DbiStream.h" +#include "llvm/DebugInfo/PDB/Native/FormatUtil.h" #include "llvm/DebugInfo/PDB/Native/InfoStream.h" #include "llvm/DebugInfo/PDB/Native/ModuleDebugStream.h" #include "llvm/DebugInfo/PDB/Native/PDBFile.h" @@ -83,13 +83,13 @@ static void printHeader(LinePrinter &P, const Twine &S) { } BytesOutputStyle::BytesOutputStyle(PDBFile &File) - : File(File), P(2, false, outs()) {} + : File(File), P(2, false, outs(), opts::Filters) {} Error BytesOutputStyle::dump() { - if (opts::bytes::DumpBlockRange.hasValue()) { + if (opts::bytes::DumpBlockRange) { auto &R = *opts::bytes::DumpBlockRange; - uint32_t Max = R.Max.getValueOr(R.Min); + uint32_t Max = R.Max.value_or(R.Min); if (Max < R.Min) return make_error<StringError>( @@ -104,9 +104,9 @@ Error BytesOutputStyle::dump() { P.NewLine(); } - if (opts::bytes::DumpByteRange.hasValue()) { + if (opts::bytes::DumpByteRange) { auto &R = *opts::bytes::DumpByteRange; - uint32_t Max = R.Max.getValueOr(File.getFileSize()); + uint32_t Max = R.Max.value_or(File.getFileSize()); if (Max < R.Min) return make_error<StringError>("Invalid byte range specified. Max < Min", |