1 files changed, 9 insertions, 21 deletions

diff --git a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
index fdd191e0cbf..38147946175 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -870,13 +870,13 @@ static Expected<SymInfo> getSymbolInfo(const object::ObjectFile &Obj,
 
     Expected<uint64_t> SymAddrOrErr = Sym->getAddress();
     if (!SymAddrOrErr)
-      return createError("failed to compute symbol address: ",
+      return createError("error: failed to compute symbol address: ",
                          SymAddrOrErr.takeError());
 
     // Also remember what section this symbol is in for later
     auto SectOrErr = Sym->getSection();
     if (!SectOrErr)
-      return createError("failed to get symbol section: ",
+      return createError("error: failed to get symbol section: ",
                          SectOrErr.takeError());
 
     RSec = *SectOrErr;
@@ -937,14 +937,8 @@ Error DWARFContextInMemory::maybeDecompress(const SectionRef &Sec,
   return Error::success();
 }
 
-ErrorPolicy DWARFContextInMemory::defaultErrorHandler(Error E) {
-  errs() << "error: " + toString(std::move(E)) << '\n';
-  return ErrorPolicy::Continue;
-}
-
-DWARFContextInMemory::DWARFContextInMemory(
-    const object::ObjectFile &Obj, const LoadedObjectInfo *L,
-    function_ref<ErrorPolicy(Error)> HandleError)
+DWARFContextInMemory::DWARFContextInMemory(const object::ObjectFile &Obj,
+                                           const LoadedObjectInfo *L)
     : FileName(Obj.getFileName()), IsLittleEndian(Obj.isLittleEndian()),
       AddressSize(Obj.getBytesInAddress()) {
   for (const SectionRef &Section : Obj.sections()) {
@@ -967,10 +961,9 @@ DWARFContextInMemory::DWARFContextInMemory(
       Section.getContents(data);
 
     if (auto Err = maybeDecompress(Section, name, data)) {
-      ErrorPolicy EP = HandleError(
-          createError("failed to decompress '" + name + "', ", std::move(Err)));
-      if (EP == ErrorPolicy::Halt)
-        return;
+      errs() << "error: failed to decompress '" + name + "', " +
+                    toString(std::move(Err))
+             << '\n';
       continue;
     }
 
@@ -1062,8 +1055,7 @@ DWARFContextInMemory::DWARFContextInMemory(
 
       Expected<SymInfo> SymInfoOrErr = getSymbolInfo(Obj, Reloc, L, AddrCache);
       if (!SymInfoOrErr) {
-        if (HandleError(SymInfoOrErr.takeError()) == ErrorPolicy::Halt)
-          return;
+        errs() << toString(SymInfoOrErr.takeError()) << '\n';
         continue;
       }
 
@@ -1072,11 +1064,7 @@ DWARFContextInMemory::DWARFContextInMemory(
       if (V.error()) {
         SmallString<32> Name;
         Reloc.getTypeName(Name);
-        ErrorPolicy EP = HandleError(
-            createError("failed to compute relocation: " + name + ", ",
-                        errorCodeToError(object_error::parse_failed)));
-        if (EP == ErrorPolicy::Halt)
-          return;
+        errs() << "error: failed to compute relocation: " << Name << "\n";
         continue;
       }
       RelocAddrEntry Rel = {SymInfoOrErr->SectionIndex, Val};