[obj2yaml][XCOFF] Dump sections

[Esme]

Summary

This patch implements parsing sections for obj2yaml on AIX.

[Esme]

Gently ping.

[qiucf]

llvm/include/llvm/ObjectYAML/XCOFFYAML.h

59 ↗

(On Diff #328365)

Better to add brief comment like length or symbol table index, depending on symbol type.? Like D68650.

llvm/test/tools/obj2yaml/XCOFF/aix.yaml

6–7

As I see this test is not auto-generated? So can we reduce the indents to make the diff minimal?

llvm/tools/obj2yaml/xcoff2yaml.cpp

35

Why not change return type to Error?

150

Put break inside brace.

[jhenderson]

You'll need someone with XCOFF experience to review this too. Generally looks fine from my brief look though.

llvm/test/tools/obj2yaml/XCOFF/aix.yaml

0–1

It would be nice if we could replace the canned binary input with a YAML input and then use yaml2obj to produce the YAML for consumption by obj2yaml at some point in the future. That'll allow us proper flexibility to test all code paths.

7

Nit: add extra spaces to make things line up nicely.

Should this be a CHECK-NEXT though? If so, delete the blank line above it.

llvm/tools/obj2yaml/xcoff2yaml.cpp

41–43

58

Perhaps report this as a regular error using createStringError()? No need for report_fatal_error when we have an easy way to report the Error after all.

59–60

No need for the else here.

79

This and the similar relocation check below - do you actually need it? If a user had an invalid object, where the section type was different to what it should be (e.g. a bug in an object producer), this check would prevent using obj2yaml, yet in my mind, the YAML could easily represent this state.

[Esme]

1. Address comment.
2. Rebase on D85774 and D95505.

llvm/test/tools/obj2yaml/XCOFF/aix.yaml

0–1

Yes, I agree with that. However, the yaml2obj is not yet fully implemented and some fields this test need like the symbol auxiliary entries are not yet supported in yaml2obj. I will replace the canned binary input with a YAML input in the future.

[jhenderson]

llvm/test/tools/obj2yaml/XCOFF/aix.yaml

0–1

Is there a particular need for obj2yaml support ahead of yaml2obj support for these things? I'm just wondering whether it would be better to wait.

[Esme]

llvm/test/tools/obj2yaml/XCOFF/aix.yaml

0–1

There is no particular reason for obj2yaml support to be ahead of yaml2obj, except that if I can use obj2yaml to convert compiled object files to readable yaml files, it will help me to implement yaml2obj.

[jhenderson]

llvm/test/tools/obj2yaml/XCOFF/aix.yaml

0–1

The problem is that there's currently quite a lot of noise (e.g. the excessive section content) in this test that isn't all that useful. There are also a number of cases that aren't properly covered by this test input (e.g. sections with no relocations, empty sections etc), and you may find it difficult to cover all of them using a canned binary. Better to wait until you've got sufficient yaml2obj support for the basic structure, and then develop the two in tandem (i.e. add a feature to yaml2obj and at the same time, mirror it in obj2yaml).

There's of course nothing stopping you having this patch applied locally to help you in your yaml2obj development.

llvm/tools/obj2yaml/xcoff2yaml.cpp

83

Here and throughout, you need testing for your error cases, i.e. what obj2yaml does when this error is triggered.

139

Do you have testing for the case where this is false?

144–146

I'm not convinced this belongs at all. Why do you do this check only for debug builds?

158

Here and elsewhere - this is the more normal TODO syntax in LLVM.

[Esme]

1. Only dump sections.
2. Replace the binary input with the yaml input.

[jhenderson]

You still need testing for your error cases, i.e. showing that obj2yaml produces a suitable error (or possibly follows some fallback path) when it encounters invalid content.

llvm/test/tools/obj2yaml/XCOFF/aix.yaml

11–20

Here and below, we usually remove excessive spacing, so that the values neatly line up, as close as possible to the tags. See the suggested edit for an example of what I mean.

llvm/tools/obj2yaml/xcoff2yaml.cpp

58

Probably, this should just be errc::not_implemented (or something along those lines) - the file type is valid, we just haven't added support yet.

Is there much difference between 64 and 32-bit sections though, or could you just remove this error entirely and do the right thing?

[Esme]

Address comment.

1. Add 64-bit support and test.
2. Test error paths.

[jhenderson]

llvm/test/tools/obj2yaml/XCOFF/aix.yaml

136–141

Strictly, this should be like the inline edit (and same immediately below), but I'm not too fussed by that.

llvm/test/tools/obj2yaml/XCOFF/invalid.yaml

1

You should consider splitting this test into separate files, e.g. invalid-section and invalid-symbol, as I suspect it will grow as obj2yaml support for XCOFF improves.

13–20

28

Not for this patch, but it would be nice if we could get the actual useful error message, rather than the error code converted to an error message. That would ensure the message actually provides useful context (here the question could be raised "which section index? Where was it and what was its value?"

llvm/tools/obj2yaml/xcoff2yaml.cpp

93–94

This error path appears to be untested?

[Esme]

Address comment

[jhenderson]

LGTM!

llvm/test/tools/obj2yaml/XCOFF/aix.yaml

-# RUN: obj2yaml %S/Inputs/aix_xcoff.o | FileCheck %s
-# Test that we can parse the XCOFF object file correctly.
-# CHECK: --- !XCOFF
-# CHECK-NEXT: FileHeader:
-# CHECK-NEXT:   MagicNumber:     0x1DF
-# CHECK-NEXT:   NumberOfSections: 2
-# CHECK-NEXT:   CreationTime:    1552337792
-# CHECK-NEXT:   OffsetToSymbolTable: 0x13A
-# CHECK-NEXT:   EntriesInSymbolTable: 22
-# CHECK-NEXT:   AuxiliaryHeaderSize: 0
-# CHECK-NEXT:   Flags:           0x0
+## This is a basic test to check if we can parse the XCOFF object file correctly.
+# RUN: yaml2obj %s -DMAGIC=0x01DF -o %t-32
+# RUN: obj2yaml %t-32 | FileCheck %s --check-prefix=CHECK32
+# RUN: yaml2obj %s -DMAGIC=0x01F7 -o %t-64
+# RUN: obj2yaml %t-64 | FileCheck %s --check-prefix=CHECK64
 
-# CHECK: Symbols:
-# CHECK-NEXT:   - Name:      .file
-# CHECK-NEXT:     Value:     0x0
-# CHECK-NEXT:     Section: N_DEBUG
-# CHECK-NEXT:     Type:      0x3
-# CHECK-NEXT:     StorageClass:    C_FILE
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      i
-# CHECK-NEXT:     Value:     0x0
-# CHECK-NEXT:     Section: N_UNDEF
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_EXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      TestforXcoff
-# CHECK-NEXT:     Value:     0x0
-# CHECK-NEXT:     Section: N_UNDEF
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_EXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      .text
-# CHECK-NEXT:     Value:     0x0
-# CHECK-NEXT:     Section: .text
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_HIDEXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      .main
-# CHECK-NEXT:     Value:     0x0
-# CHECK-NEXT:     Section: .text
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_EXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      main
-# CHECK-NEXT:     Value:     0x60
-# CHECK-NEXT:     Section: .data
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_HIDEXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      main
-# CHECK-NEXT:     Value:     0x60
-# CHECK-NEXT:     Section: .data
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_EXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      .data
-# CHECK-NEXT:     Value:     0x70
-# CHECK-NEXT:     Section: .data
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_HIDEXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      TOC
-# CHECK-NEXT:     Value:     0x74
-# CHECK-NEXT:     Section: .data
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_HIDEXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      i
-# CHECK-NEXT:     Value:     0x74
-# CHECK-NEXT:     Section: .data
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_HIDEXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      TestforXcoff
-# CHECK-NEXT:     Value:     0x78
-# CHECK-NEXT:     Section: .data
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_HIDEXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-## TODO: Dump the string table.
+# CHECK32:      --- !XCOFF
+# CHECK32-NEXT: FileHeader:
+# CHECK32-NEXT:   MagicNumber:     0x1DF
+# CHECK32-NEXT:   NumberOfSections: 2
+# CHECK32-NEXT:   CreationTime:    0
+# CHECK32-NEXT:   OffsetToSymbolTable: 0x80
+# CHECK32-NEXT:   EntriesInSymbolTable: 4
+# CHECK32-NEXT:   AuxiliaryHeaderSize: 0
+# CHECK32-NEXT:   Flags:           0x0
+# CHECK32-NEXT: Sections:
+# CHECK32-NEXT:   - Name:            .text
+# CHECK32-NEXT:     Address:         0x0
+# CHECK32-NEXT:     Size:            0x4
+# CHECK32-NEXT:     FileOffsetToData: 0x64
+# CHECK32-NEXT:     FileOffsetToRelocations: 0x6C
+# CHECK32-NEXT:     FileOffsetToLineNumbers: 0x0
+# CHECK32-NEXT:     NumberOfRelocations: 0x1
+# CHECK32-NEXT:     NumberOfLineNumbers: 0x0
+# CHECK32-NEXT:     Flags:           [ STYP_TEXT ]
+# CHECK32-NEXT:     SectionData:     '00007400'
+# CHECK32-NEXT:     Relocations:
+# CHECK32-NEXT:       - Address:         0xE
+# CHECK32-NEXT:         Symbol:          0x12
+# CHECK32-NEXT:         Info:            0xF
+# CHECK32-NEXT:         Type:            0x3
+# CHECK32-NEXT:   - Name:            .data
+# CHECK32-NEXT:     Address:         0x4
+# CHECK32-NEXT:     Size:            0x4
+# CHECK32-NEXT:     FileOffsetToData: 0x68
+# CHECK32-NEXT:     FileOffsetToRelocations: 0x76
+# CHECK32-NEXT:     FileOffsetToLineNumbers: 0x0
+# CHECK32-NEXT:     NumberOfRelocations: 0x1
+# CHECK32-NEXT:     NumberOfLineNumbers: 0x0
+# CHECK32-NEXT:     Flags:           [ STYP_DATA ]
+# CHECK32-NEXT:     SectionData:     '00007700'
+# CHECK32-NEXT:     Relocations:
+# CHECK32-NEXT:       - Address:         0x60
+# CHECK32-NEXT:         Symbol:          0x8
+# CHECK32-NEXT:         Info:            0x1F
+# CHECK32-NEXT:         Type:            0x0
+# CHECK32-NEXT: Symbols:
+# CHECK32-NEXT:   - Name:            TestforXcoff
+# CHECK32-NEXT:     Value:           0x0
+# CHECK32-NEXT:     Section:         N_UNDEF
+# CHECK32-NEXT:     Type:            0x0
+# CHECK32-NEXT:     StorageClass:    C_EXT
+# CHECK32-NEXT:     NumberOfAuxEntries: 1
+# CHECK32-NEXT:   - Name:            .data
+# CHECK32-NEXT:     Value:           0x70
+# CHECK32-NEXT:     Section:         .data
+# CHECK32-NEXT:     Type:            0x0
+# CHECK32-NEXT:     StorageClass:    C_HIDEXT
+# CHECK32-NEXT:     NumberOfAuxEntries: 1
+
+# CHECK64:      --- !XCOFF
+# CHECK64-NEXT: FileHeader:
+# CHECK64-NEXT:   MagicNumber:     0x1F7
+# CHECK64-NEXT:   NumberOfSections: 2
+# CHECK64-NEXT:   CreationTime:    0
+# CHECK64-NEXT:   OffsetToSymbolTable: 0xCC
+# CHECK64-NEXT:   EntriesInSymbolTable: 4
+# CHECK64-NEXT:   AuxiliaryHeaderSize: 0
+# CHECK64-NEXT:   Flags:           0x0
+# CHECK64-NEXT: Sections:
+# CHECK64-NEXT:   - Name:            .text
+# CHECK64-NEXT:     Address:         0x0
+# CHECK64-NEXT:     Size:            0x4
+# CHECK64-NEXT:     FileOffsetToData: 0xA8
+# CHECK64-NEXT:     FileOffsetToRelocations: 0xB0
+# CHECK64-NEXT:     FileOffsetToLineNumbers: 0x0
+# CHECK64-NEXT:     NumberOfRelocations: 0x1
+# CHECK64-NEXT:     NumberOfLineNumbers: 0x0
+# CHECK64-NEXT:     Flags:           [ STYP_TEXT ]
+# CHECK64-NEXT:     SectionData:     '00007400'
+# CHECK64-NEXT:     Relocations:
+# CHECK64-NEXT:       - Address:         0xE
+# CHECK64-NEXT:         Symbol:          0x12
+# CHECK64-NEXT:         Info:            0xF
+# CHECK64-NEXT:         Type:            0x3
+# CHECK64-NEXT:   - Name:            .data
+# CHECK64-NEXT:     Address:         0x4
+# CHECK64-NEXT:     Size:            0x4
+# CHECK64-NEXT:     FileOffsetToData: 0xAC
+# CHECK64-NEXT:     FileOffsetToRelocations: 0xBE
+# CHECK64-NEXT:     FileOffsetToLineNumbers: 0x0
+# CHECK64-NEXT:     NumberOfRelocations: 0x1
+# CHECK64-NEXT:     NumberOfLineNumbers: 0x0
+# CHECK64-NEXT:     Flags:           [ STYP_DATA ]
+# CHECK64-NEXT:     SectionData:     '00007700'
+# CHECK64-NEXT:     Relocations:
+# CHECK64-NEXT:       - Address:         0x60
+# CHECK64-NEXT:         Symbol:          0x8
+# CHECK64-NEXT:         Info:            0x1F
+# CHECK64-NEXT:         Type:            0x0
+# CHECK64-NEXT: Symbols:
+# CHECK64-NEXT:   - Name:            TestforXcoff
+# CHECK64-NEXT:     Value:           0x0
+# CHECK64-NEXT:     Section:         N_UNDEF
+# CHECK64-NEXT:     Type:            0x0
+# CHECK64-NEXT:     StorageClass:    C_EXT
+# CHECK64-NEXT:     NumberOfAuxEntries: 1
+# CHECK64-NEXT:   - Name:            .data
+# CHECK64-NEXT:     Value:           0x70
+# CHECK64-NEXT:     Section:         .data
+# CHECK64-NEXT:     Type:            0x0
+# CHECK64-NEXT:     StorageClass:    C_HIDEXT
+# CHECK64-NEXT:     NumberOfAuxEntries: 1
+
+--- !XCOFF
+FileHeader:
+  MagicNumber: [[MAGIC]]
+Sections:
+  - Name:        .text
+    Flags:       [ STYP_TEXT ]
+    SectionData: '00007400'
+    Relocations:
+      - Address: 0xE
+        Symbol:  0x12
+        Info:    0xF
+        Type:    0x3
+  - Name:        .data
+    Flags:       [ STYP_DATA ]
+    SectionData: '00007700'
+    Relocations:
+      - Address: 0x60
+        Symbol:  0x8
+        Info:    0x1F
+        Type:    0x0
+Symbols:
+  - Name:         TestforXcoff
+    Value:        0x0
+    Section:      N_UNDEF
+    Type:         0x0
+    StorageClass: C_EXT
+    NumberOfAuxEntries: 1
+  - Name:         .data
+    Value:        0x70
+    Section:      .data
+    Type:         0x0
+    StorageClass: C_HIDEXT
+    NumberOfAuxEntries: 1

llvm/test/tools/obj2yaml/XCOFF/invalid.yaml

+## Test that obj2yaml reports a suitable error when it encounters invalid content.
+
+## Error1: failed to get section data.
+# RUN: yaml2obj %s -DOFFSETTODATA=0x70 -o %t1
+# RUN: not obj2yaml %t1 2>&1 | FileCheck %s -DFILE=%t1 --check-prefix=ERROR1
+
+# ERROR1: Error reading file: [[FILE]]: The end of the file was unexpectedly encountered
+
+--- !XCOFF
+FileHeader:
+  MagicNumber: 0x01DF
+Sections:
+  - Name:        .text
+    Flags:       [ STYP_TEXT ]
+    SectionData: '00007400'
+    FileOffsetToData: [[OFFSETTODATA=0x00]]
+Symbols:
+  - Name:         .longSymName
+    Value:        0x70
+    Section:      [[SYMSECNAME=".text"]]
+StringTable:
+  Length: [[STRLENGTH=<none>]]
+
+## Error2: failed to get the section name for a symbol.
+# RUN: yaml2obj %s -DSYMSECNAME='.data' -o %t2
+# RUN: not obj2yaml %t2 2>&1 | FileCheck %s -DFILE=%t2 --check-prefix=ERROR2
+
+# ERROR2: Error reading file: [[FILE]]: Invalid section index
+
+## Error3: failed to get the symbol name.
+# RUN: yaml2obj %s -DSTRLENGTH=0 -o %t3
+# RUN: not obj2yaml %t3 2>&1 | FileCheck %s -DFILE=%t3 --check-prefix=ERROR3
+
+# ERROR3: Error reading file: [[FILE]]: Invalid data was encountered while parsing the file

llvm/tools/obj2yaml/xcoff2yaml.cpp

 //===------ xcoff2yaml.cpp - XCOFF YAMLIO implementation --------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "obj2yaml.h"
 #include "llvm/Object/XCOFFObjectFile.h"
 #include "llvm/ObjectYAML/XCOFFYAML.h"
+#include "llvm/Support/Errc.h"
 #include "llvm/Support/YAMLTraits.h"
 
 using namespace llvm;
 using namespace llvm::object;
 namespace {
 
 class XCOFFDumper {
   const object::XCOFFObjectFile &Obj;
   XCOFFYAML::Object YAMLObj;
   void dumpHeader();
-  std::error_code dumpSymbols();
+  Error dumpSections();
+  Error dumpSymbols();
+  template <typename Shdr, typename Reloc>
+  Error dumpSections(ArrayRef<Shdr> Sections);
 
 public:
   XCOFFDumper(const object::XCOFFObjectFile &obj) : Obj(obj) {}
-  std::error_code dump();
+  Error dump();
   XCOFFYAML::Object &getYAMLObj() { return YAMLObj; }
 };
 } // namespace
 
-std::error_code XCOFFDumper::dump() {
+Error XCOFFDumper::dump() {
   dumpHeader();
+  if (Error E = dumpSections())
+    return E;
   return dumpSymbols();
 }
 
 void XCOFFDumper::dumpHeader() {
-
   YAMLObj.Header.Magic = Obj.getMagic();
   YAMLObj.Header.NumberOfSections = Obj.getNumberOfSections();
   YAMLObj.Header.TimeStamp = Obj.getTimeStamp();
-
-  // TODO FIXME only dump 32 bit header for now.
-  if (Obj.is64Bit())
-    report_fatal_error("64-bit XCOFF files not supported yet.");
-  YAMLObj.Header.SymbolTableOffset = Obj.getSymbolTableOffset32();
-
+  YAMLObj.Header.SymbolTableOffset = Obj.is64Bit()
+                                         ? Obj.getSymbolTableOffset64()
+                                         : Obj.getSymbolTableOffset32();
   YAMLObj.Header.NumberOfSymTableEntries =
-      Obj.getRawNumberOfSymbolTableEntries32();
+      Obj.is64Bit() ? Obj.getNumberOfSymbolTableEntries64()
+                    : Obj.getRawNumberOfSymbolTableEntries32();
   YAMLObj.Header.AuxHeaderSize = Obj.getOptionalHeaderSize();
   YAMLObj.Header.Flags = Obj.getFlags();
 }
 
-std::error_code XCOFFDumper::dumpSymbols() {
+Error XCOFFDumper::dumpSections() {
+  if (Obj.is64Bit())
+    return dumpSections<XCOFFSectionHeader64, XCOFFRelocation64>(
+        Obj.sections64());
+  return dumpSections<XCOFFSectionHeader32, XCOFFRelocation32>(
+      Obj.sections32());
+}
+
+template <typename Shdr, typename Reloc>
+Error XCOFFDumper::dumpSections(ArrayRef<Shdr> Sections) {
+  std::vector<XCOFFYAML::Section> &YamlSections = YAMLObj.Sections;
+  for (const Shdr &S : Sections) {
+    XCOFFYAML::Section YamlSec;
+    YamlSec.SectionName = S.getName();
+    YamlSec.Address = S.PhysicalAddress;
+    YamlSec.Size = S.SectionSize;
+    YamlSec.NumberOfRelocations = S.NumberOfRelocations;
+    YamlSec.NumberOfLineNumbers = S.NumberOfLineNumbers;
+    YamlSec.FileOffsetToData = S.FileOffsetToRawData;
+    YamlSec.FileOffsetToRelocations = S.FileOffsetToRelocationInfo;
+    YamlSec.FileOffsetToLineNumbers = S.FileOffsetToLineNumberInfo;
+    YamlSec.Flags = S.Flags;
+
+    // Dump section data.
+    if (S.FileOffsetToRawData) {
+      DataRefImpl SectionDRI;
+      SectionDRI.p = reinterpret_cast<uintptr_t>(&S);
+      Expected<ArrayRef<uint8_t>> SecDataRefOrErr =
+          Obj.getSectionContents(SectionDRI);
+      if (!SecDataRefOrErr)
+        return SecDataRefOrErr.takeError();
+      YamlSec.SectionData = SecDataRefOrErr.get();
+    }
+
+    // Dump relocations.
+    if (S.NumberOfRelocations) {
+      auto RelRefOrErr = Obj.relocations<Shdr, Reloc>(S);
+      if (!RelRefOrErr)
+        return RelRefOrErr.takeError();
+      for (const Reloc &R : RelRefOrErr.get()) {
+        XCOFFYAML::Relocation YamlRel;
+        YamlRel.Type = R.Type;
+        YamlRel.Info = R.Info;
+        YamlRel.SymbolIndex = R.SymbolIndex;
+        YamlRel.VirtualAddress = R.VirtualAddress;
+        YamlSec.Relocations.push_back(YamlRel);
+      }
+    }
+    YamlSections.push_back(YamlSec);
+  }
+  return Error::success();
+}
+
+Error XCOFFDumper::dumpSymbols() {
   std::vector<XCOFFYAML::Symbol> &Symbols = YAMLObj.Symbols;
 
   for (const SymbolRef &S : Obj.symbols()) {
     DataRefImpl SymbolDRI = S.getRawDataRefImpl();
     const XCOFFSymbolRef SymbolEntRef = Obj.toSymbolRef(SymbolDRI);
     XCOFFYAML::Symbol Sym;
 
     Expected<StringRef> SymNameRefOrErr = Obj.getSymbolName(SymbolDRI);
     if (!SymNameRefOrErr) {
-      return errorToErrorCode(SymNameRefOrErr.takeError());
+      return SymNameRefOrErr.takeError();
     }
     Sym.SymbolName = SymNameRefOrErr.get();
 
     Sym.Value = SymbolEntRef.getValue();
 
     Expected<StringRef> SectionNameRefOrErr =
         Obj.getSymbolSectionName(SymbolEntRef);
     if (!SectionNameRefOrErr)
-      return errorToErrorCode(SectionNameRefOrErr.takeError());
+      return SectionNameRefOrErr.takeError();
 
     Sym.SectionName = SectionNameRefOrErr.get();
 
     Sym.Type = SymbolEntRef.getSymbolType();
     Sym.StorageClass = SymbolEntRef.getStorageClass();
     Sym.NumberOfAuxEntries = SymbolEntRef.getNumberOfAuxEntries();
     Symbols.push_back(Sym);
   }
 
-  return std::error_code();
+  return Error::success();
 }
 
 std::error_code xcoff2yaml(raw_ostream &Out,
                            const object::XCOFFObjectFile &Obj) {
   XCOFFDumper Dumper(Obj);
 
-  if (std::error_code EC = Dumper.dump())
-    return EC;
+  if (Error E = Dumper.dump())
+    return errorToErrorCode(std::move(E));
 
   yaml::Output Yout(Out);
   Yout << Dumper.getYAMLObj();
 
   return std::error_code();
 }