Recommit [Object] Change object::SectionRef::getContents() to return Expected<StringRef>

r360876 didn't fix 2 call sites in clang.

Expected<ArrayRef<uint8_t>> may be better but use Expected<StringRef> for now.

Follow-up of D61781.

llvm-svn: 360892

include/llvm/Object/ObjectFile.h

@@ -98,7 +98,7 @@ public:
   uint64_t getAddress() const;
   uint64_t getIndex() const;
   uint64_t getSize() const;
-  std::error_code getContents(StringRef &Result) const;
+  Expected<StringRef> getContents() const;
 
   /// Get the alignment of this section as the actual value (not log 2).
   uint64_t getAlignment() const;
@@ -454,13 +454,12 @@ inline uint64_t SectionRef::getSize() const {
   return OwningObject->getSectionSize(SectionPimpl);
 }
 
-inline std::error_code SectionRef::getContents(StringRef &Result) const {
+inline Expected<StringRef> SectionRef::getContents() const {
   Expected<ArrayRef<uint8_t>> Res =
       OwningObject->getSectionContents(SectionPimpl);
   if (!Res)
-    return errorToErrorCode(Res.takeError());
+    return Res.takeError();
-  Result = StringRef(reinterpret_cast<const char *>(Res->data()), Res->size());
+  return StringRef(reinterpret_cast<const char *>(Res->data()), Res->size());
-  return std::error_code();
 }
 
 inline uint64_t SectionRef::getAlignment() const {

lib/DebugInfo/DWARF/DWARFContext.cpp

@@ -1410,8 +1410,14 @@ public:
       // Try to obtain an already relocated version of this section.
       // Else use the unrelocated section from the object file. We'll have to
       // apply relocations ourselves later.
-      if (!L || !L->getLoadedSectionContents(*RelocatedSection, Data))
+      if (!L || !L->getLoadedSectionContents(*RelocatedSection, Data)) {
-        Section.getContents(Data);
+        Expected<StringRef> E = Section.getContents();
+        if (E)
+          Data = *E;
+        else
+          // maybeDecompress below will error.
+          consumeError(E.takeError());
+      }
 
       if (auto Err = maybeDecompress(Section, Name, Data)) {
         ErrorPolicy EP = HandleError(createError(

lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp

@@ -53,13 +53,13 @@ SymbolizableObjectFile::create(object::ObjectFile *Obj,
   if (Obj->getArch() == Triple::ppc64) {
     for (section_iterator Section : Obj->sections()) {
       StringRef Name;
-      StringRef Data;
       if (auto EC = Section->getName(Name))
         return EC;
       if (Name == ".opd") {
-        if (auto EC = Section->getContents(Data))
+        Expected<StringRef> E = Section->getContents();
-          return EC;
+        if (!E)
-        OpdExtractor.reset(new DataExtractor(Data, Obj->isLittleEndian(),
+          return errorToErrorCode(E.takeError());
+        OpdExtractor.reset(new DataExtractor(*E, Obj->isLittleEndian(),
                                              Obj->getBytesInAddress()));
         OpdAddress = Section->getAddress();
         break;

lib/DebugInfo/Symbolize/Symbolize.cpp

@@ -221,9 +221,12 @@ bool getGNUDebuglinkContents(const ObjectFile *Obj, std::string &DebugName,
     Section.getName(Name);
     Name = Name.substr(Name.find_first_not_of("._"));
     if (Name == "gnu_debuglink") {
-      StringRef Data;
+      Expected<StringRef> ContentsOrErr = Section.getContents();
-      Section.getContents(Data);
+      if (!ContentsOrErr) {
-      DataExtractor DE(Data, Obj->isLittleEndian(), 0);
+        consumeError(ContentsOrErr.takeError());
+        return false;
+      }
+      DataExtractor DE(*ContentsOrErr, Obj->isLittleEndian(), 0);
       uint32_t Offset = 0;
       if (const char *DebugNameStr = DE.getCStr(&Offset)) {
         // 4-byte align the offset.

lib/ExecutionEngine/JITLink/MachOAtomGraphBuilder.cpp

@@ -136,14 +136,14 @@ Error MachOAtomGraphBuilder::parseSections() {
 
     if (!SecRef.isVirtual()) {
       // If this section has content then record it.
-      StringRef Content;
+      Expected<StringRef> Content = SecRef.getContents();
-      if (auto EC = SecRef.getContents(Content))
+      if (!Content)
-        return errorCodeToError(EC);
+        return Content.takeError();
-      if (Content.size() != SecRef.getSize())
+      if (Content->size() != SecRef.getSize())
         return make_error<JITLinkError>("Section content size does not match "
                                         "declared size for " +
                                         Name);
-      MachOSec.setContent(Content);
+      MachOSec.setContent(*Content);
     } else {
       // If this is a zero-fill section then just record the size.
       MachOSec.setZeroFill(SecRef.getSize());

lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp

@@ -792,8 +792,10 @@ RuntimeDyldImpl::emitSection(const ObjectFile &Obj,
   if (!IsVirtual && !IsZeroInit) {
     // In either case, set the location of the unrelocated section in memory,
     // since we still process relocations for it even if we're not applying them.
-    if (auto EC = Section.getContents(data))
+    if (Expected<StringRef> E = Section.getContents())
-      return errorCodeToError(EC);
+      data = *E;
+    else
+      return E.takeError();
     pData = data.data();
   }
 

lib/Object/ELFObjectFile.cpp

@@ -377,12 +377,13 @@ ELFObjectFileBase::getPltAddresses() const {
   }
   if (!Plt || !RelaPlt || !GotPlt)
     return {};
-  StringRef PltContents;
+  Expected<StringRef> PltContents = Plt->getContents();
-  if (Plt->getContents(PltContents))
+  if (!PltContents) {
+    consumeError(PltContents.takeError());
     return {};
-  ArrayRef<uint8_t> PltBytes((const uint8_t *)PltContents.data(),
+  }
-                             Plt->getSize());
+  auto PltEntries = MIA->findPltEntries(Plt->getAddress(),
-  auto PltEntries = MIA->findPltEntries(Plt->getAddress(), PltBytes,
+                                        arrayRefFromStringRef(*PltContents),
                                         GotPlt->getAddress(), Triple);
   // Build a map from GOT entry virtual address to PLT entry virtual address.
   DenseMap<uint64_t, uint64_t> GotToPlt;

lib/Object/IRObjectFile.cpp

@@ -74,12 +74,12 @@ Expected<MemoryBufferRef>
 IRObjectFile::findBitcodeInObject(const ObjectFile &Obj) {
   for (const SectionRef &Sec : Obj.sections()) {
     if (Sec.isBitcode()) {
-      StringRef SecContents;
+      Expected<StringRef> Contents = Sec.getContents();
-      if (std::error_code EC = Sec.getContents(SecContents))
+      if (!Contents)
-        return errorCodeToError(EC);
+        return Contents.takeError();
-      if (SecContents.size() <= 1)
+      if (Contents->size() <= 1)
         return errorCodeToError(object_error::bitcode_section_not_found);
-      return MemoryBufferRef(SecContents, Obj.getFileName());
+      return MemoryBufferRef(*Contents, Obj.getFileName());
     }
   }
 

lib/Object/Object.cpp

@@ -247,10 +247,10 @@ uint64_t LLVMGetSectionSize(LLVMSectionIteratorRef SI) {
 }
 
 const char *LLVMGetSectionContents(LLVMSectionIteratorRef SI) {
-  StringRef ret;
+  if (Expected<StringRef> E = (*unwrap(SI))->getContents())
-  if (std::error_code ec = (*unwrap(SI))->getContents(ret))
+    return E->data();
-    report_fatal_error(ec.message());
+  else
-  return ret.data();
+    report_fatal_error(E.takeError());
 }
 
 uint64_t LLVMGetSectionAddress(LLVMSectionIteratorRef SI) {

lib/ProfileData/Coverage/CoverageMappingReader.cpp

@@ -348,8 +348,10 @@ Expected<bool> RawCoverageMappingDummyChecker::isDummy() {
 }
 
 Error InstrProfSymtab::create(SectionRef &Section) {
-  if (auto EC = Section.getContents(Data))
+  Expected<StringRef> DataOrErr = Section.getContents();
-    return errorCodeToError(EC);
+  if (!DataOrErr)
+    return DataOrErr.takeError();
+  Data = *DataOrErr;
   Address = Section.getAddress();
 
   // If this is a linked PE/COFF file, then we have to skip over the null byte
@@ -687,8 +689,11 @@ static Error loadBinaryFormat(MemoryBufferRef ObjectBuffer,
     return E;
 
   // Get the contents of the given sections.
-  if (auto EC = CoverageSection->getContents(CoverageMapping))
+  if (Expected<StringRef> E = CoverageSection->getContents())
-    return errorCodeToError(EC);
+    CoverageMapping = *E;
+  else
+    return E.takeError();
+
   if (Error E = ProfileNames.create(*NamesSection))
     return E;
 

lib/XRay/InstrumentationMap.cpp

@@ -78,9 +78,10 @@ loadObj(StringRef Filename, object::OwningBinary<object::ObjectFile> &ObjFile,
         "Failed to find XRay instrumentation map.",
         std::make_error_code(std::errc::executable_format_error));
 
-  if (I->getContents(Contents))
+  if (Expected<StringRef> E = I->getContents())
-    return errorCodeToError(
+    Contents = *E;
-        std::make_error_code(std::errc::executable_format_error));
+  else
+    return E.takeError();
 
   RelocMap Relocs;
   if (ObjFile.getBinary()->isELF()) {

tools/dsymutil/DwarfLinker.cpp

@@ -436,9 +436,13 @@ static bool isMachOPairedReloc(uint64_t RelocType, uint64_t Arch) {
 void DwarfLinker::RelocationManager::findValidRelocsMachO(
     const object::SectionRef &Section, const object::MachOObjectFile &Obj,
     const DebugMapObject &DMO) {
-  StringRef Contents;
+  Expected<StringRef> ContentsOrErr = Section.getContents();
-  Section.getContents(Contents);
+  if (!ContentsOrErr) {
-  DataExtractor Data(Contents, Obj.isLittleEndian(), 0);
+    consumeError(ContentsOrErr.takeError());
+    Linker.reportWarning("error reading section", DMO);
+    return;
+  }
+  DataExtractor Data(*ContentsOrErr, Obj.isLittleEndian(), 0);
   bool SkipNext = false;
 
   for (const object::RelocationRef &Reloc : Section.relocations()) {

tools/dsymutil/DwarfStreamer.cpp

@@ -667,10 +667,12 @@ void DwarfStreamer::translateLineTable(DataExtractor Data, uint32_t Offset,
 
 static void emitSectionContents(const object::ObjectFile &Obj,
                                 StringRef SecName, MCStreamer *MS) {
-  StringRef Contents;
+  if (auto Sec = getSectionByName(Obj, SecName)) {
-  if (auto Sec = getSectionByName(Obj, SecName))
+    if (Expected<StringRef> E = Sec->getContents())
-    if (!Sec->getContents(Contents))
+      MS->EmitBytes(*E);
-      MS->EmitBytes(Contents);
+    else
+      consumeError(E.takeError());
+  }
 }
 
 void DwarfStreamer::copyInvariantDebugSection(const object::ObjectFile &Obj) {

tools/llvm-cfi-verify/lib/FileAnalysis.cpp

@@ -453,13 +453,11 @@ Error FileAnalysis::parseCodeSections() {
     if (!Section.getName(SectionName) && SectionName == ".plt")
       continue;
 
-    StringRef SectionContents;
+    Expected<StringRef> Contents = Section.getContents();
-    if (Section.getContents(SectionContents))
+    if (!Contents)
-      return make_error<StringError>("Failed to retrieve section contents",
+      return Contents.takeError();
-                                     inconvertibleErrorCode());
+    ArrayRef<uint8_t> SectionBytes = arrayRefFromStringRef(*Contents);
 
-    ArrayRef<uint8_t> SectionBytes((const uint8_t *)SectionContents.data(),
-                                   Section.getSize());
     parseSectionContents(SectionBytes,
                          {Section.getAddress(), Section.getIndex()});
   }

tools/llvm-cov/TestingSupport.cpp

@@ -69,9 +69,18 @@ int convertForTestingMain(int argc, const char *argv[]) {
   uint64_t ProfileNamesAddress = ProfileNames.getAddress();
   StringRef CoverageMappingData;
   StringRef ProfileNamesData;
-  if (CoverageMapping.getContents(CoverageMappingData) ||
+  if (Expected<StringRef> E = CoverageMapping.getContents())
-      ProfileNames.getContents(ProfileNamesData))
+    CoverageMappingData = *E;
+  else {
+    consumeError(E.takeError());
     return 1;
+  }
+  if (Expected<StringRef> E = ProfileNames.getContents())
+    ProfileNamesData = *E;
+  else {
+    consumeError(E.takeError());
+    return 1;
+  }
 
   int FD;
   if (auto Err = sys::fs::openFileForWrite(OutputFilename, FD)) {

tools/llvm-cxxdump/llvm-cxxdump.cpp

@@ -48,15 +48,20 @@ static void error(std::error_code EC) {
   exit(1);
 }
 
-static void error(Error Err) {
+LLVM_ATTRIBUTE_NORETURN static void error(Error Err) {
-  if (!Err)
-    return;
   logAllUnhandledErrors(std::move(Err), WithColor::error(outs()),
                         "reading file: ");
   outs().flush();
   exit(1);
 }
 
+template <typename T>
+T unwrapOrError(Expected<T> EO) {
+  if (!EO)
+    error(EO.takeError());
+  return std::move(*EO);
+}
+
 } // namespace llvm
 
 static void reportError(StringRef Input, StringRef Message) {
@@ -195,8 +200,7 @@ static void dumpCXXData(const ObjectFile *Obj) {
     // Skip virtual or BSS sections.
     if (Sec.isBSS() || Sec.isVirtual())
       continue;
-    StringRef SecContents;
+    StringRef SecContents = unwrapOrError(Sec.getContents());
-    error(Sec.getContents(SecContents));
     Expected<uint64_t> SymAddressOrErr = Sym.getAddress();
     error(errorToErrorCode(SymAddressOrErr.takeError()));
     uint64_t SymAddress = *SymAddressOrErr;
@@ -510,7 +514,8 @@ static void dumpArchive(const Archive *Arc) {
     else
       reportError(Arc->getFileName(), cxxdump_error::unrecognized_file_format);
   }
-  error(std::move(Err));
+  if (Err)
+    error(std::move(Err));
 }
 
 static void dumpInput(StringRef File) {

tools/llvm-dwp/llvm-dwp.cpp

@@ -410,9 +410,10 @@ static Error handleSection(
   if (std::error_code Err = Section.getName(Name))
     return errorCodeToError(Err);
 
-  StringRef Contents;
+  Expected<StringRef> ContentsOrErr = Section.getContents();
-  if (auto Err = Section.getContents(Contents))
+  if (!ContentsOrErr)
-    return errorCodeToError(Err);
+    return ContentsOrErr.takeError();
+  StringRef Contents = *ContentsOrErr;
 
   if (auto Err = handleCompressedSection(UncompressedSections, Name, Contents))
     return Err;

tools/llvm-objdump/MachODump.cpp

@@ -1482,8 +1482,8 @@ static void DumpLiteralPointerSection(MachOObjectFile *O,
       section_type = Sec.flags & MachO::SECTION_TYPE;
     }
 
-    StringRef BytesStr;
+    StringRef BytesStr = unwrapOrError(Sect->getContents(), O->getFileName());
-    Sect->getContents(BytesStr);
+
     const char *Contents = reinterpret_cast<const char *>(BytesStr.data());
 
     switch (section_type) {
@@ -1697,8 +1697,8 @@ static void DumpSectionContents(StringRef Filename, MachOObjectFile *O,
         }
         uint32_t section_type = section_flags & MachO::SECTION_TYPE;
 
-        StringRef BytesStr;
+        StringRef BytesStr =
-        Section.getContents(BytesStr);
+            unwrapOrError(Section.getContents(), O->getFileName());
         const char *sect = reinterpret_cast<const char *>(BytesStr.data());
         uint32_t sect_size = BytesStr.size();
         uint64_t sect_addr = Section.getAddress();
@@ -1782,8 +1782,8 @@ static void DumpInfoPlistSectionContents(StringRef Filename,
     if (SegName == "__TEXT" && SectName == "__info_plist") {
       if (!NoLeadingHeaders)
         outs() << "Contents of (" << SegName << "," << SectName << ") section\n";
-      StringRef BytesStr;
+      StringRef BytesStr =
-      Section.getContents(BytesStr);
+          unwrapOrError(Section.getContents(), O->getFileName());
       const char *sect = reinterpret_cast<const char *>(BytesStr.data());
       outs() << format("%.*s", BytesStr.size(), sect) << "\n";
       return;
@@ -3194,8 +3194,8 @@ static const char *get_pointer_64(uint64_t Address, uint32_t &offset,
       S = (*(info->Sections))[SectIdx];
       offset = Address - SectAddress;
       left = SectSize - offset;
-      StringRef SectContents;
+      StringRef SectContents = unwrapOrError(
-      ((*(info->Sections))[SectIdx]).getContents(SectContents);
+          ((*(info->Sections))[SectIdx]).getContents(), info->O->getFileName());
       return SectContents.data() + offset;
     }
   }
@@ -3998,8 +3998,7 @@ walk_pointer_list_64(const char *listname, const SectionRef S,
   StringRef SegName = O->getSectionFinalSegmentName(Ref);
   outs() << "Contents of (" << SegName << "," << SectName << ") section\n";
 
-  StringRef BytesStr;
+  StringRef BytesStr = unwrapOrError(S.getContents(), O->getFileName());
-  S.getContents(BytesStr);
   const char *Contents = reinterpret_cast<const char *>(BytesStr.data());
 
   for (uint32_t i = 0; i < S.getSize(); i += sizeof(uint64_t)) {
@@ -4049,8 +4048,7 @@ walk_pointer_list_32(const char *listname, const SectionRef S,
   StringRef SegName = O->getSectionFinalSegmentName(Ref);
   outs() << "Contents of (" << SegName << "," << SectName << ") section\n";
 
-  StringRef BytesStr;
+  StringRef BytesStr = unwrapOrError(S.getContents(), O->getFileName());
-  S.getContents(BytesStr);
   const char *Contents = reinterpret_cast<const char *>(BytesStr.data());
 
   for (uint32_t i = 0; i < S.getSize(); i += sizeof(uint32_t)) {
@@ -7242,8 +7240,8 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF,
     if (SegmentName != DisSegName)
       continue;
 
-    StringRef BytesStr;
+    StringRef BytesStr =
-    Sections[SectIdx].getContents(BytesStr);
+        unwrapOrError(Sections[SectIdx].getContents(), Filename);
     ArrayRef<uint8_t> Bytes = arrayRefFromStringRef(BytesStr);
     uint64_t SectAddress = Sections[SectIdx].getAddress();
 
@@ -7696,9 +7694,8 @@ printMachOCompactUnwindSection(const MachOObjectFile *Obj,
   uint32_t PointerSize = Is64 ? sizeof(uint64_t) : sizeof(uint32_t);
   uint32_t EntrySize = 3 * PointerSize + 2 * sizeof(uint32_t);
 
-  StringRef Contents;
+  StringRef Contents =
-  CompactUnwind.getContents(Contents);
+      unwrapOrError(CompactUnwind.getContents(), Obj->getFileName());
-
   SmallVector<CompactUnwindEntry, 4> CompactUnwinds;
 
   // First populate the initial raw offsets, encodings and so on from the entry.
@@ -7839,8 +7836,8 @@ static void printMachOUnwindInfoSection(const MachOObjectFile *Obj,
 
   outs() << "Contents of __unwind_info section:\n";
 
-  StringRef Contents;
+  StringRef Contents =
-  UnwindInfo.getContents(Contents);
+      unwrapOrError(UnwindInfo.getContents(), Obj->getFileName());
   ptrdiff_t Pos = 0;
 
   //===----------------------------------

tools/llvm-objdump/llvm-objdump.cpp

@@ -1126,9 +1126,8 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
     SmallString<40> Comments;
     raw_svector_ostream CommentStream(Comments);
 
-    StringRef BytesStr;
+    ArrayRef<uint8_t> Bytes = arrayRefFromStringRef(
-    error(Section.getContents(BytesStr));
+        unwrapOrError(Section.getContents(), Obj->getFileName()));
-    ArrayRef<uint8_t> Bytes = arrayRefFromStringRef(BytesStr);
 
     uint64_t VMAAdjustment = 0;
     if (shouldAdjustVA(Section))
@@ -1561,7 +1560,6 @@ void printSectionHeaders(const ObjectFile *Obj) {
 void printSectionContents(const ObjectFile *Obj) {
   for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
     StringRef Name;
-    StringRef Contents;
     error(Section.getName(Name));
     uint64_t BaseAddr = Section.getAddress();
     uint64_t Size = Section.getSize();
@@ -1576,7 +1574,7 @@ void printSectionContents(const ObjectFile *Obj) {
       continue;
     }
 
-    error(Section.getContents(Contents));
+    StringRef Contents = unwrapOrError(Section.getContents(), Obj->getFileName());
 
     // Dump out the content as hex and printable ascii characters.
     for (std::size_t Addr = 0, End = Contents.size(); Addr < End; Addr += 16) {
@@ -1764,8 +1762,8 @@ void printRawClangAST(const ObjectFile *Obj) {
   if (!ClangASTSection)
     return;
 
-  StringRef ClangASTContents;
+  StringRef ClangASTContents = unwrapOrError(
-  error(ClangASTSection.getValue().getContents(ClangASTContents));
+      ClangASTSection.getValue().getContents(), Obj->getFileName());
   outs().write(ClangASTContents.data(), ClangASTContents.size());
 }
 
@@ -1801,9 +1799,8 @@ static void printFaultMaps(const ObjectFile *Obj) {
     return;
   }
 
-  StringRef FaultMapContents;
+  StringRef FaultMapContents =
-  error(FaultMapSection.getValue().getContents(FaultMapContents));
+      unwrapOrError(FaultMapSection.getValue().getContents(), Obj->getFileName());
-
   FaultMapParser FMP(FaultMapContents.bytes_begin(),
                      FaultMapContents.bytes_end());
 

tools/llvm-pdbutil/DumpOutputStyle.cpp

@@ -1376,12 +1376,12 @@ Error DumpOutputStyle::dumpTypesFromObjectFile() {
     else
       continue;
 
-    StringRef Contents;
+    Expected<StringRef> ContentsOrErr = S.getContents();
-    if (auto EC = S.getContents(Contents))
+    if (!ContentsOrErr)
-      return errorCodeToError(EC);
+      return ContentsOrErr.takeError();
 
     uint32_t Magic;
-    BinaryStreamReader Reader(Contents, llvm::support::little);
+    BinaryStreamReader Reader(*ContentsOrErr, llvm::support::little);
     if (auto EC = Reader.readInteger(Magic))
       return EC;
     if (Magic != COFF::DEBUG_SECTION_MAGIC)

tools/llvm-pdbutil/InputFile.cpp

@@ -66,17 +66,20 @@ getModuleDebugStream(PDBFile &File, StringRef &ModuleName, uint32_t Index) {
 static inline bool isCodeViewDebugSubsection(object::SectionRef Section,
                                              StringRef Name,
                                              BinaryStreamReader &Reader) {
-  StringRef SectionName, Contents;
+  StringRef SectionName;
   if (Section.getName(SectionName))
     return false;
 
   if (SectionName != Name)
     return false;
 
-  if (Section.getContents(Contents))
+  Expected<StringRef> ContentsOrErr = Section.getContents();
+  if (!ContentsOrErr) {
+    consumeError(ContentsOrErr.takeError());
     return false;
+  }
 
-  Reader = BinaryStreamReader(Contents, support::little);
+  Reader = BinaryStreamReader(*ContentsOrErr, support::little);
   uint32_t Magic;
   if (Reader.bytesRemaining() < sizeof(uint32_t))
     return false;

tools/llvm-readobj/COFFDumper.cpp

@@ -933,8 +933,7 @@ void COFFDumper::initializeFileAndStringTables(BinaryStreamReader &Reader) {
 
 void COFFDumper::printCodeViewSymbolSection(StringRef SectionName,
                                             const SectionRef &Section) {
-  StringRef SectionContents;
+  StringRef SectionContents = unwrapOrError(Section.getContents());
-  error(Section.getContents(SectionContents));
   StringRef Data = SectionContents;
 
   SmallVector<StringRef, 10> FunctionNames;
@@ -1218,8 +1217,7 @@ void COFFDumper::mergeCodeViewTypes(MergingTypeTableBuilder &CVIDs,
     StringRef SectionName;
     error(S.getName(SectionName));
     if (SectionName == ".debug$T") {
-      StringRef Data;
+      StringRef Data = unwrapOrError(S.getContents());
-      error(S.getContents(Data));
       uint32_t Magic;
       error(consume(Data, Magic));
       if (Magic != 4)
@@ -1255,8 +1253,7 @@ void COFFDumper::printCodeViewTypeSection(StringRef SectionName,
   ListScope D(W, "CodeViewTypes");
   W.printNumber("Section", SectionName, Obj->getSectionID(Section));
 
-  StringRef Data;
+  StringRef Data = unwrapOrError(Section.getContents());
-  error(Section.getContents(Data));
   if (opts::CodeViewSubsectionBytes)
     W.printBinaryBlock("Data", Data);
 
@@ -1316,9 +1313,7 @@ void COFFDumper::printSectionHeaders() {
 
     if (opts::SectionData &&
         !(Section->Characteristics & COFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA)) {
-      StringRef Data;
+      StringRef Data = unwrapOrError(Sec.getContents());
-      error(Sec.getContents(Data));
-
       W.printBinaryBlock("SectionData", Data);
     }
   }
@@ -1660,15 +1655,13 @@ void COFFDumper::printCOFFExports() {
 
 void COFFDumper::printCOFFDirectives() {
   for (const SectionRef &Section : Obj->sections()) {
-    StringRef Contents;
     StringRef Name;
 
     error(Section.getName(Name));
     if (Name != ".drectve")
       continue;
 
-    error(Section.getContents(Contents));
+    StringRef Contents = unwrapOrError(Section.getContents());
-
     W.printString("Directive(s)", Contents);
   }
 }
@@ -1707,8 +1700,7 @@ void COFFDumper::printCOFFResources() {
     if (!Name.startswith(".rsrc"))
       continue;
 
-    StringRef Ref;
+    StringRef Ref = unwrapOrError(S.getContents());
-    error(S.getContents(Ref));
 
     if ((Name == ".rsrc") || (Name == ".rsrc$01")) {
       ResourceSectionRef RSF(Ref);
@@ -1834,8 +1826,7 @@ void COFFDumper::printStackMap() const {
   if (StackMapSection == object::SectionRef())
     return;
 
-  StringRef StackMapContents;
+  StringRef StackMapContents = unwrapOrError(StackMapSection.getContents());
-  StackMapSection.getContents(StackMapContents);
   ArrayRef<uint8_t> StackMapContentsArray =
       arrayRefFromStringRef(StackMapContents);
 
@@ -1861,8 +1852,7 @@ void COFFDumper::printAddrsig() {
   if (AddrsigSection == object::SectionRef())
     return;
 
-  StringRef AddrsigContents;
+  StringRef AddrsigContents = unwrapOrError(AddrsigSection.getContents());
-  AddrsigSection.getContents(AddrsigContents);
   ArrayRef<uint8_t> AddrsigContentsArray(AddrsigContents.bytes_begin(),
                                          AddrsigContents.size());
 

tools/llvm-readobj/MachODumper.cpp

@@ -483,15 +483,8 @@ void MachODumper::printSectionHeaders(const MachOObjectFile *Obj) {
       }
     }
 
-    if (opts::SectionData) {
+    if (opts::SectionData && !Section.isBSS())
-      bool IsBSS = Section.isBSS();
+      W.printBinaryBlock("SectionData", unwrapOrError(Section.getContents()));
-      if (!IsBSS) {
-        StringRef Data;
-        error(Section.getContents(Data));
-
-        W.printBinaryBlock("SectionData", Data);
-      }
-    }
   }
 }
 
@@ -660,8 +653,7 @@ void MachODumper::printStackMap() const {
   if (StackMapSection == object::SectionRef())
     return;
 
-  StringRef StackMapContents;
+  StringRef StackMapContents = unwrapOrError(StackMapSection.getContents());
-  StackMapSection.getContents(StackMapContents);
   ArrayRef<uint8_t> StackMapContentsArray =
       arrayRefFromStringRef(StackMapContents);
 

tools/llvm-readobj/ObjDumper.cpp

@@ -73,8 +73,7 @@ void ObjDumper::printSectionAsString(const object::ObjectFile *Obj,
     error(E);
   W.startLine() << "String dump of section '" << SectionName << "':\n";
 
-  StringRef SectionContent;
+  StringRef SectionContent = unwrapOrError(Section.getContents());
-  Section.getContents(SectionContent);
 
   const uint8_t *SecContent = SectionContent.bytes_begin();
   const uint8_t *CurrentWord = SecContent;
@@ -107,8 +106,7 @@ void ObjDumper::printSectionAsHex(const object::ObjectFile *Obj,
     error(E);
   W.startLine() << "Hex dump of section '" << SectionName << "':\n";
 
-  StringRef SectionContent;
+  StringRef SectionContent = unwrapOrError(Section.getContents());
-  Section.getContents(SectionContent);
   const uint8_t *SecContent = SectionContent.bytes_begin();
   const uint8_t *SecEnd = SecContent + SectionContent.size();
 

tools/sancov/sancov.cpp

@@ -841,9 +841,9 @@ static void getObjectCoveragePoints(const object::ObjectFile &O,
     if (!SectSize)
       continue;
 
-    StringRef BytesStr;
+    Expected<StringRef> BytesStr = Section.getContents();
-    failIfError(Section.getContents(BytesStr));
+    failIfError(BytesStr);
-    ArrayRef<uint8_t> Bytes = arrayRefFromStringRef(BytesStr);
+    ArrayRef<uint8_t> Bytes = arrayRefFromStringRef(*BytesStr);
 
     for (uint64_t Index = 0, Size = 0; Index < Section.getSize();
          Index += Size) {