Importing rustc-1.52.1 Change-Id: I3598a97301b4b2e71385e5a519f6d2ad946548b6
diff --git a/src/llvm-project/llvm/tools/llvm-readobj/WasmDumper.cpp b/src/llvm-project/llvm/tools/llvm-readobj/WasmDumper.cpp index a02dbb9..fb7134d 100644 --- a/src/llvm-project/llvm/tools/llvm-readobj/WasmDumper.cpp +++ b/src/llvm-project/llvm/tools/llvm-readobj/WasmDumper.cpp
@@ -10,7 +10,6 @@ // //===----------------------------------------------------------------------===// -#include "Error.h" #include "ObjDumper.h" #include "llvm-readobj.h" #include "llvm/Object/Wasm.h" @@ -25,7 +24,7 @@ #define ENUM_ENTRY(X) \ { #X, wasm::WASM_SYMBOL_TYPE_##X } ENUM_ENTRY(FUNCTION), ENUM_ENTRY(DATA), ENUM_ENTRY(GLOBAL), - ENUM_ENTRY(SECTION), ENUM_ENTRY(EVENT), + ENUM_ENTRY(SECTION), ENUM_ENTRY(EVENT), ENUM_ENTRY(TABLE), #undef ENUM_ENTRY }; @@ -58,7 +57,7 @@ class WasmDumper : public ObjDumper { public: WasmDumper(const WasmObjectFile *Obj, ScopedPrinter &Writer) - : ObjDumper(Writer), Obj(Obj) {} + : ObjDumper(Writer, Obj->getFileName()), Obj(Obj) {} void printFileHeaders() override; void printSectionHeaders() override; @@ -241,14 +240,9 @@ namespace llvm { -std::error_code createWasmDumper(const object::ObjectFile *Obj, - ScopedPrinter &Writer, - std::unique_ptr<ObjDumper> &Result) { - const auto *WasmObj = dyn_cast<WasmObjectFile>(Obj); - assert(WasmObj && "createWasmDumper called with non-wasm object"); - - Result.reset(new WasmDumper(WasmObj, Writer)); - return readobj_error::success; +std::unique_ptr<ObjDumper> createWasmDumper(const object::WasmObjectFile &Obj, + ScopedPrinter &Writer) { + return std::make_unique<WasmDumper>(&Obj, Writer); } } // namespace llvm