diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2021-06-13 19:31:46 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2021-06-13 19:37:19 +0000 |
| commit | e8d8bef961a50d4dc22501cde4fb9fb0be1b2532 (patch) | |
| tree | 94f04805f47bb7c59ae29690d8952b6074fff602 /contrib/llvm-project/llvm/tools/llvm-readobj/XCOFFDumper.cpp | |
| parent | bb130ff39747b94592cb26d71b7cb097b9a4ea6b (diff) | |
| parent | b60736ec1405bb0a8dd40989f67ef4c93da068ab (diff) | |
| download | src-e8d8bef961a50d4dc22501cde4fb9fb0be1b2532.tar.gz src-e8d8bef961a50d4dc22501cde4fb9fb0be1b2532.zip | |
Merge llvm-project main llvmorg-12-init-17869-g8e464dd76bef
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-12-init-17869-g8e464dd76bef, the last commit before the
upstream release/12.x branch was created.
PR: 255570
MFC after: 6 weeks
Diffstat (limited to 'contrib/llvm-project/llvm/tools/llvm-readobj/XCOFFDumper.cpp')
| -rw-r--r-- | contrib/llvm-project/llvm/tools/llvm-readobj/XCOFFDumper.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/contrib/llvm-project/llvm/tools/llvm-readobj/XCOFFDumper.cpp b/contrib/llvm-project/llvm/tools/llvm-readobj/XCOFFDumper.cpp index dd62f98d9595..8f0f18cedceb 100644 --- a/contrib/llvm-project/llvm/tools/llvm-readobj/XCOFFDumper.cpp +++ b/contrib/llvm-project/llvm/tools/llvm-readobj/XCOFFDumper.cpp @@ -10,7 +10,6 @@ // //===----------------------------------------------------------------------===// -#include "Error.h" #include "ObjDumper.h" #include "llvm-readobj.h" #include "llvm/Object/XCOFFObjectFile.h" @@ -25,7 +24,7 @@ class XCOFFDumper : public ObjDumper { public: XCOFFDumper(const XCOFFObjectFile &Obj, ScopedPrinter &Writer) - : ObjDumper(Writer), Obj(Obj) {} + : ObjDumper(Writer, Obj.getFileName()), Obj(Obj) {} void printFileHeaders() override; void printSectionHeaders() override; @@ -515,14 +514,8 @@ void XCOFFDumper::printSectionHeaders(ArrayRef<T> Sections) { } namespace llvm { -std::error_code createXCOFFDumper(const object::ObjectFile *Obj, - ScopedPrinter &Writer, - std::unique_ptr<ObjDumper> &Result) { - const XCOFFObjectFile *XObj = dyn_cast<XCOFFObjectFile>(Obj); - if (!XObj) - return readobj_error::unsupported_obj_file_format; - - Result.reset(new XCOFFDumper(*XObj, Writer)); - return readobj_error::success; +std::unique_ptr<ObjDumper> +createXCOFFDumper(const object::XCOFFObjectFile &XObj, ScopedPrinter &Writer) { + return std::make_unique<XCOFFDumper>(XObj, Writer); } } // namespace llvm |