From bc619cde52348dcaa9ad5d19a1ca1ff68a60e529 Mon Sep 17 00:00:00 2001
From: David Blaikie <dblaikie@gmail.com>
Date: Tue, 17 May 2016 23:44:13 +0000
Subject: llvm-dwp: remove some unused error handling

llvm-svn: 269866
---
 llvm/tools/llvm-dwp/llvm-dwp.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'llvm/tools')

diff --git a/llvm/tools/llvm-dwp/llvm-dwp.cpp b/llvm/tools/llvm-dwp/llvm-dwp.cpp
index 5a3d69bef85..1f3bb786d41 100644
--- a/llvm/tools/llvm-dwp/llvm-dwp.cpp
+++ b/llvm/tools/llvm-dwp/llvm-dwp.cpp
@@ -54,7 +54,7 @@ static opt<std::string> OutputFilename(Required, "o",
                                        value_desc("filename"),
                                        cat(DwpCategory));
 
-static Error
+static void
 writeStringsAndOffsets(MCStreamer &Out, StringMap<uint32_t> &Strings,
                        uint32_t &StringOffset, MCSection *StrSection,
                        MCSection *StrOffsetSection, StringRef CurStrSection,
@@ -62,7 +62,7 @@ writeStringsAndOffsets(MCStreamer &Out, StringMap<uint32_t> &Strings,
   // Could possibly produce an error or warning if one of these was non-null but
   // the other was null.
   if (CurStrSection.empty() || CurStrOffsetSection.empty())
-    return Error();
+    return;
 
   DenseMap<uint32_t, uint32_t> OffsetRemapping;
 
@@ -93,8 +93,6 @@ writeStringsAndOffsets(MCStreamer &Out, StringMap<uint32_t> &Strings,
     auto NewOffset = OffsetRemapping[OldOffset];
     Out.EmitIntValue(NewOffset, 4);
   }
-
-  return Error();
 }
 
 static uint32_t getCUAbbrev(StringRef Abbrev, uint64_t AbbrCode) {
@@ -558,10 +556,9 @@ static Error write(MCStreamer &Out, ArrayRef<std::string> Inputs) {
                   CurEntry, ContributionOffsets[DW_SECT_TYPES - DW_SECT_INFO]);
     }
 
-    if (auto Err = writeStringsAndOffsets(Out, Strings, StringOffset,
-                                          StrSection, StrOffsetSection,
-                                          CurStrSection, CurStrOffsetSection))
-      return Err;
+    writeStringsAndOffsets(Out, Strings, StringOffset, StrSection,
+                           StrOffsetSection, CurStrSection,
+                           CurStrOffsetSection);
   }
 
   // Lie about there being no info contributions so the TU index only includes
-- 
cgit v1.2.3