1 files changed, 3 insertions, 15 deletions
diff --git a/contrib/llvm-project/llvm/lib/Object/ObjectFile.cpp b/contrib/llvm-project/llvm/lib/Object/ObjectFile.cpp
index 098b3d8f8dd0..101f5dcc0821 100644
--- a/contrib/llvm-project/llvm/lib/Object/ObjectFile.cpp
+++ b/contrib/llvm-project/llvm/lib/Object/ObjectFile.cpp
@@ -32,13 +32,6 @@
 using namespace llvm;
 using namespace object;
 
-raw_ostream &object::operator<<(raw_ostream &OS, const SectionedAddress &Addr) {
-  OS << "SectionedAddress{" << format_hex(Addr.Address, 10);
-  if (Addr.SectionIndex != SectionedAddress::UndefSection)
-    OS << ", " << Addr.SectionIndex;
-  return OS << "}";
-}
-
 void ObjectFile::anchor() {}
 
 ObjectFile::ObjectFile(unsigned int Type, MemoryBufferRef Source)
@@ -74,10 +67,8 @@ Error ObjectFile::printSymbolName(raw_ostream &OS, DataRefImpl Symb) const {
 uint32_t ObjectFile::getSymbolAlignment(DataRefImpl DRI) const { return 0; }
 
 bool ObjectFile::isSectionBitcode(DataRefImpl Sec) const {
-  Expected<StringRef> NameOrErr = getSectionName(Sec);
-  if (NameOrErr)
+  if (Expected<StringRef> NameOrErr = getSectionName(Sec))
     return *NameOrErr == ".llvmbc";
-  consumeError(NameOrErr.takeError());
   return false;
 }
 
@@ -91,8 +82,7 @@ bool ObjectFile::isBerkeleyData(DataRefImpl Sec) const {
   return isSectionData(Sec);
 }
 
-Expected<section_iterator>
-ObjectFile::getRelocatedSection(DataRefImpl Sec) const {
+section_iterator ObjectFile::getRelocatedSection(DataRefImpl Sec) const {
   return section_iterator(SectionRef(Sec, this));
 }
 
@@ -113,7 +103,7 @@ Triple ObjectFile::makeTriple() const {
     TheTriple.setObjectFormat(Triple::MachO);
 
   if (isCOFF()) {
-    const auto COFFObj = cast<COFFObjectFile>(this);
+    const auto COFFObj = dyn_cast<COFFObjectFile>(this);
     if (COFFObj->getArch() == Triple::thumb)
       TheTriple.setTriple("thumbv7-windows");
   }
@@ -137,8 +127,6 @@ ObjectFile::createObjectFile(MemoryBufferRef Object, file_magic Type) {
   case file_magic::pdb:
   case file_magic::minidump:
     return errorCodeToError(object_error::invalid_file_type);
-  case file_magic::tapi_file:
-    return errorCodeToError(object_error::invalid_file_type);
   case file_magic::elf:
   case file_magic::elf_relocatable:
   case file_magic::elf_executable: