Remove unnecessary temporary variable.

[oota-llvm.git] / tools / llvm-objdump / COFFDump.cpp

diff --git a/tools/llvm-objdump/COFFDump.cpp b/tools/llvm-objdump/COFFDump.cpp
index 91ca5ba7e2e1f84222f4953bd6459abc575fd4fa..90ebe8c51830d0a125ab69d85bb0c8b61118ab06 100644 (file)
--- a/tools/llvm-objdump/COFFDump.cpp
+++ b/tools/llvm-objdump/COFFDump.cpp
@@ -224,10 +224,8 @@ static void printCOFFSymbolAddress(llvm::raw_ostream &Out,
                                    const std::vector<RelocationRef> &Rels,
                                    uint64_t Offset, uint32_t Disp) {
   StringRef Sym;
-  if (error_code EC = resolveSymbolName(Rels, Offset, Sym)) {
-    error(EC);
-    return ;
-  }
+  if (error(resolveSymbolName(Rels, Offset, Sym)))
+    return;
   Out << Sym;
   if (Disp > 0)
     Out << format(" + 0x%04x", Disp);
@@ -253,6 +251,13 @@ printSEHTable(const COFFObjectFile *Obj, uint32_t TableVA, int Count) {
 }
 
 static void printLoadConfiguration(const COFFObjectFile *Obj) {
+  // Skip if it's not executable.
+  const pe32_header *PE32Header;
+  if (error(Obj->getPE32Header(PE32Header)))
+    return;
+  if (!PE32Header)
+    return;
+
   const coff_file_header *Header;
   if (error(Obj->getCOFFHeader(Header)))
     return;