summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-pdbutil/InputFile.cpp
diff options
context:
space:
mode:
authorGeorge Rimar <grimar@accesssoftek.com>2019-08-14 08:56:55 +0000
committerGeorge Rimar <grimar@accesssoftek.com>2019-08-14 08:56:55 +0000
commit468919e18231d0c30b5c0f84a87145db06e3554b (patch)
treee1dbabaed556c88253db5a4bc75935b923ecf595 /llvm/tools/llvm-pdbutil/InputFile.cpp
parenta0c6a3571422826e856002714d9bb008584fe8b3 (diff)
downloadbcm5719-llvm-468919e18231d0c30b5c0f84a87145db06e3554b.tar.gz
bcm5719-llvm-468919e18231d0c30b5c0f84a87145db06e3554b.zip
Revert r368812 "[llvm/Object] - Convert SectionRef::getName() to return Expected<>"
It broke clang BB: http://lab.llvm.org:8011/builders/clang-x86_64-debian-fast/builds/16455 llvm-svn: 368813
Diffstat (limited to 'llvm/tools/llvm-pdbutil/InputFile.cpp')
-rw-r--r--llvm/tools/llvm-pdbutil/InputFile.cpp11
1 files changed, 5 insertions, 6 deletions
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) {
OpenPOWER on IntegriCloud