Vendor import of llvm-project main llvmorg-14-init-17616-g024a1fab5c35. - src

diff options


context:
space:
mode:

author	Dimitry Andric <dim@FreeBSD.org>	2022-01-27 22:06:42 +0000
committer	Dimitry Andric <dim@FreeBSD.org>	2022-01-27 22:06:42 +0000
commit	6f8fc217eaa12bf657be1c6468ed9938d10168b3 (patch)
tree	a1fd89b864d9b93e2ad68fe1dcf7afee2e3c8d76 /llvm/tools/llvm-objdump
parent	77fc4c146f0870ffb09c1afb823ccbe742c5e6ff (diff)

Vendor import of llvm-project main llvmorg-14-init-17616-g024a1fab5c35.vendor/llvm-project/llvmorg-14-init-17616-g024a1fab5c35

Diffstat (limited to 'llvm/tools/llvm-objdump')

-rw-r--r--

llvm/tools/llvm-objdump/COFFDump.h

-rw-r--r--

llvm/tools/llvm-objdump/MachODump.cpp

-rw-r--r--

llvm/tools/llvm-objdump/SourcePrinter.h

-rw-r--r--

llvm/tools/llvm-objdump/WasmDump.cpp

-rw-r--r--

llvm/tools/llvm-objdump/llvm-objdump.cpp

-rw-r--r--

llvm/tools/llvm-objdump/llvm-objdump.h

6 files changed, 7 insertions, 12 deletions

diff --git a/llvm/tools/llvm-objdump/COFFDump.h b/llvm/tools/llvm-objdump/COFFDump.h
index f933f79523a0..ffd39671debe 100644
--- a/llvm/tools/llvm-objdump/COFFDump.h
+++ b/llvm/tools/llvm-objdump/COFFDump.h

@@ -18,7 +18,6 @@ class Error;

namespace object {

class COFFObjectFile;

class COFFImportFile;

-class ObjectFile;

class RelocationRef;

} // namespace object

diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp
index b0cf1f775ced..31867625f0e5 100644
--- a/llvm/tools/llvm-objdump/MachODump.cpp
+++ b/llvm/tools/llvm-objdump/MachODump.cpp

@@ -917,10 +917,10 @@ static void PrintRelocationEntries(const MachOObjectFile *O,

else {

SymbolRef Symbol = *O->getSymbolByIndex(r_symbolnum);

Expected<StringRef> SymNameNext = Symbol.getName();

- const char *name = NULL;

+ const char *name = nullptr;

if (SymNameNext)

name = SymNameNext->data();

- if (name == NULL)

+ if (name == nullptr)

outs() << format("?(%d)\n", r_symbolnum);

else

outs() << name << "\n";

@@ -10231,12 +10231,12 @@ static void PrintMachHeader(const MachOObjectFile *Obj, bool verbose) {

}

void objdump::printMachOFileHeader(const object::ObjectFile *Obj) {

- const MachOObjectFile *file = dyn_cast<const MachOObjectFile>(Obj);

+ const MachOObjectFile *file = cast<const MachOObjectFile>(Obj);

PrintMachHeader(file, Verbose);

}

void objdump::printMachOLoadCommands(const object::ObjectFile *Obj) {

- const MachOObjectFile *file = dyn_cast<const MachOObjectFile>(Obj);

+ const MachOObjectFile *file = cast<const MachOObjectFile>(Obj);

uint32_t filetype = 0;

uint32_t cputype = 0;

if (file->is64Bit()) {

diff --git a/llvm/tools/llvm-objdump/SourcePrinter.h b/llvm/tools/llvm-objdump/SourcePrinter.h
index 21d5bdcf8a49..31d46e3108f6 100644
--- a/llvm/tools/llvm-objdump/SourcePrinter.h
+++ b/llvm/tools/llvm-objdump/SourcePrinter.h

@@ -80,7 +80,7 @@ class LiveVariablePrinter {

public:

LiveVariablePrinter(const MCRegisterInfo &MRI, const MCSubtargetInfo &STI)

- : LiveVariables(), ActiveCols(Column()), MRI(MRI), STI(STI) {}

+ : ActiveCols(Column()), MRI(MRI), STI(STI) {}

void dump() const;

diff --git a/llvm/tools/llvm-objdump/WasmDump.cpp b/llvm/tools/llvm-objdump/WasmDump.cpp
index 28311361d97e..df0a08e5b1dd 100644
--- a/llvm/tools/llvm-objdump/WasmDump.cpp
+++ b/llvm/tools/llvm-objdump/WasmDump.cpp

@@ -20,7 +20,7 @@ using namespace llvm;

using namespace llvm::object;

void objdump::printWasmFileHeader(const object::ObjectFile *Obj) {

- const auto *File = dyn_cast<const WasmObjectFile>(Obj);

+ const auto *File = cast<const WasmObjectFile>(Obj);

outs() << "Program Header:\n";

outs() << "Version: 0x";

diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index a16f760cd1cb..6b238fa01d25 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp

@@ -2715,7 +2715,7 @@ int main(int argc, char **argv) {

return 0;

}

if (InputArgs.hasArg(HelpHiddenFlag)) {

- T->printHelp(ToolName, /*show_hidden=*/true);

+ T->printHelp(ToolName, /*ShowHidden=*/true);

return 0;

}

diff --git a/llvm/tools/llvm-objdump/llvm-objdump.h b/llvm/tools/llvm-objdump/llvm-objdump.h
index 864a9920efbe..61b6215aa5f5 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.h
+++ b/llvm/tools/llvm-objdump/llvm-objdump.h

@@ -21,10 +21,6 @@ class StringRef;

class Twine;

namespace object {

-class ELFObjectFileBase;

-class ELFSectionRef;

-class MachOObjectFile;

-class MachOUniversalBinary;

class RelocationRef;

struct VersionEntry;

} // namespace object