diff options
Diffstat (limited to 'llvm/tools/llvm-pdbutil')
| -rw-r--r-- | llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp | 7 | ||||
| -rw-r--r-- | llvm/tools/llvm-pdbutil/InputFile.cpp | 11 |
2 files changed, 8 insertions, 10 deletions
diff --git a/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp b/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp index 288e76cc173..962d4cf88a8 100644 --- a/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp +++ b/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp @@ -1369,10 +1369,9 @@ Error DumpOutputStyle::dumpTypesFromObjectFile() { LazyRandomTypeCollection Types(100); for (const auto &S : getObj().sections()) { - Expected<StringRef> NameOrErr = S.getName(); - if (!NameOrErr) - return NameOrErr.takeError(); - StringRef SectionName = *NameOrErr; + StringRef SectionName; + if (auto EC = S.getName(SectionName)) + return errorCodeToError(EC); // .debug$T is a standard CodeView type section, while .debug$P is the same // format but used for MSVC precompiled header object files. diff --git a/llvm/tools/llvm-pdbutil/InputFile.cpp b/llvm/tools/llvm-pdbutil/InputFile.cpp index 8380054b631..bd23bfdbe31 100644 --- a/llvm/tools/llvm-pdbutil/InputFile.cpp +++ b/llvm/tools/llvm-pdbutil/InputFile.cpp @@ -66,13 +66,12 @@ getModuleDebugStream(PDBFile &File, StringRef &ModuleName, uint32_t Index) { static inline bool isCodeViewDebugSubsection(object::SectionRef Section, StringRef Name, BinaryStreamReader &Reader) { - if (Expected<StringRef> NameOrErr = Section.getName()) { - if (*NameOrErr != Name) - return false; - } else { - consumeError(NameOrErr.takeError()); + StringRef SectionName; + if (Section.getName(SectionName)) + return false; + + if (SectionName != Name) return false; - } Expected<StringRef> ContentsOrErr = Section.getContents(); if (!ContentsOrErr) { |
