From 468919e18231d0c30b5c0f84a87145db06e3554b Mon Sep 17 00:00:00 2001 From: George Rimar Date: Wed, 14 Aug 2019 08:56:55 +0000 Subject: 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 --- llvm/lib/XRay/InstrumentationMap.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'llvm/lib/XRay/InstrumentationMap.cpp') diff --git a/llvm/lib/XRay/InstrumentationMap.cpp b/llvm/lib/XRay/InstrumentationMap.cpp index 7453613c703..7de953d46b7 100644 --- a/llvm/lib/XRay/InstrumentationMap.cpp +++ b/llvm/lib/XRay/InstrumentationMap.cpp @@ -67,11 +67,10 @@ loadObj(StringRef Filename, object::OwningBinary &ObjFile, StringRef Contents = ""; const auto &Sections = ObjFile.getBinary()->sections(); auto I = llvm::find_if(Sections, [&](object::SectionRef Section) { - Expected NameOrErr = Section.getName(); - if (NameOrErr) - return *NameOrErr == "xray_instr_map"; - consumeError(NameOrErr.takeError()); - return false; + StringRef Name = ""; + if (Section.getName(Name)) + return false; + return Name == "xray_instr_map"; }); if (I == Sections.end()) -- cgit v1.2.3