From cfb1356863cdd5010d331afffca803af33685240 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Fri, 9 Jun 2017 20:46:17 +0000 Subject: [PATCH] Rename llvm-pdbdump -> llvm-pdbutil. This is to reflect the evolving nature of the tool as being useful for more than just dumping PDBs, as it can do many other things. Differential Revision: https://reviews.llvm.org/D34062 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@305106 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/ReleaseNotes.rst | 4 ++++ test/CMakeLists.txt | 2 +- test/DebugInfo/PDB/DIA/pdbdump-flags.test | 8 ++++---- .../PDB/DIA/pdbdump-linenumbers.test | 4 ++-- .../PDB/DIA/pdbdump-symbol-format.test | 10 +++++----- .../PDB/Native/pdb-native-compilands.test | 4 ++-- .../PDB/Native/pdb-native-summary.test | 2 +- .../PDB/pdb-longname-truncation.test | 2 +- test/DebugInfo/PDB/pdb-minimal-construct.test | 4 ++-- test/DebugInfo/PDB/pdb-yaml-symbols.test | 2 +- test/DebugInfo/PDB/pdb-yaml-types.test | 6 +++--- .../PDB/pdbdump-debug-subsections.test | 6 +++--- test/DebugInfo/PDB/pdbdump-headers.test | 8 ++++---- .../PDB/pdbdump-merge-ids-and-types.test | 18 ++++++++--------- test/DebugInfo/PDB/pdbdump-mergeids.test | 12 +++++------ test/DebugInfo/PDB/pdbdump-mergetypes.test | 10 +++++----- test/DebugInfo/PDB/pdbdump-raw-blocks.test | 10 +++++----- test/DebugInfo/PDB/pdbdump-raw-stream.test | 4 ++-- test/DebugInfo/PDB/pdbdump-readwrite.test | 8 ++++---- test/DebugInfo/PDB/pdbdump-source-names.test | 8 ++++---- test/DebugInfo/PDB/pdbdump-write.test | 8 ++++---- test/DebugInfo/PDB/pdbdump-yaml-types.test | 2 +- test/DebugInfo/PDB/pdbdump-yaml.test | 4 ++-- test/tools/llvm-pdbdump/class-layout.test | 2 +- .../complex-padding-graphical.test | 2 +- test/tools/llvm-pdbdump/enum-layout.test | 2 +- test/tools/llvm-pdbdump/load-address.test | 4 ++-- test/tools/llvm-pdbdump/raw-stream-data.test | 6 +++--- test/tools/llvm-pdbdump/regex-filter.test | 20 +++++++++---------- .../simple-padding-graphical.test | 2 +- test/tools/llvm-pdbdump/symbol-filters.test | 16 +++++++-------- tools/LLVMBuild.txt | 2 +- .../Analyze.cpp | 0 .../{llvm-pdbdump => llvm-pdbutil}/Analyze.h | 0 .../CMakeLists.txt | 4 ++-- .../CompactTypeDumpVisitor.cpp | 0 .../CompactTypeDumpVisitor.h | 0 tools/{llvm-pdbdump => llvm-pdbutil}/Diff.cpp | 2 +- tools/{llvm-pdbdump => llvm-pdbutil}/Diff.h | 0 .../LLVMBuild.txt | 4 ++-- .../LLVMOutputStyle.cpp | 2 +- .../LLVMOutputStyle.h | 0 .../LinePrinter.cpp | 2 +- .../LinePrinter.h | 0 .../OutputStyle.h | 0 .../PdbYaml.cpp | 0 .../{llvm-pdbdump => llvm-pdbutil}/PdbYaml.h | 0 .../PrettyBuiltinDumper.cpp | 2 +- .../PrettyBuiltinDumper.h | 0 .../PrettyClassDefinitionDumper.cpp | 2 +- .../PrettyClassDefinitionDumper.h | 0 .../PrettyClassLayoutGraphicalDumper.cpp | 2 +- .../PrettyClassLayoutGraphicalDumper.h | 0 .../PrettyCompilandDumper.cpp | 4 ++-- .../PrettyCompilandDumper.h | 2 +- .../PrettyEnumDumper.cpp | 2 +- .../PrettyEnumDumper.h | 0 .../PrettyExternalSymbolDumper.cpp | 0 .../PrettyExternalSymbolDumper.h | 0 .../PrettyFunctionDumper.cpp | 2 +- .../PrettyFunctionDumper.h | 0 .../PrettyTypeDumper.cpp | 2 +- .../PrettyTypeDumper.h | 0 .../PrettyTypedefDumper.cpp | 2 +- .../PrettyTypedefDumper.h | 2 +- .../PrettyVariableDumper.cpp | 2 +- .../PrettyVariableDumper.h | 0 .../StreamUtil.cpp | 0 .../StreamUtil.h | 0 .../YAMLOutputStyle.cpp | 2 +- .../YAMLOutputStyle.h | 0 .../fuzzer/CMakeLists.txt | 6 +++--- .../fuzzer/llvm-pdbutil-fuzzer.cpp} | 4 ++-- .../llvm-pdbutil.cpp} | 6 +++--- .../llvm-pdbutil.h} | 2 +- 75 files changed, 132 insertions(+), 128 deletions(-) rename tools/{llvm-pdbdump => llvm-pdbutil}/Analyze.cpp (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/Analyze.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/CMakeLists.txt (93%) rename tools/{llvm-pdbdump => llvm-pdbutil}/CompactTypeDumpVisitor.cpp (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/CompactTypeDumpVisitor.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/Diff.cpp (99%) rename tools/{llvm-pdbdump => llvm-pdbutil}/Diff.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/LLVMBuild.txt (88%) rename tools/{llvm-pdbdump => llvm-pdbutil}/LLVMOutputStyle.cpp (99%) rename tools/{llvm-pdbdump => llvm-pdbutil}/LLVMOutputStyle.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/LinePrinter.cpp (99%) rename tools/{llvm-pdbdump => llvm-pdbutil}/LinePrinter.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/OutputStyle.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PdbYaml.cpp (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PdbYaml.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyBuiltinDumper.cpp (98%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyBuiltinDumper.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyClassDefinitionDumper.cpp (99%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyClassDefinitionDumper.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyClassLayoutGraphicalDumper.cpp (99%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyClassLayoutGraphicalDumper.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyCompilandDumper.cpp (98%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyCompilandDumper.h (95%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyEnumDumper.cpp (98%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyEnumDumper.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyExternalSymbolDumper.cpp (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyExternalSymbolDumper.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyFunctionDumper.cpp (99%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyFunctionDumper.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyTypeDumper.cpp (99%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyTypeDumper.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyTypedefDumper.cpp (99%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyTypedefDumper.h (94%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyVariableDumper.cpp (99%) rename tools/{llvm-pdbdump => llvm-pdbutil}/PrettyVariableDumper.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/StreamUtil.cpp (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/StreamUtil.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/YAMLOutputStyle.cpp (99%) rename tools/{llvm-pdbdump => llvm-pdbutil}/YAMLOutputStyle.h (100%) rename tools/{llvm-pdbdump => llvm-pdbutil}/fuzzer/CMakeLists.txt (53%) rename tools/{llvm-pdbdump/fuzzer/llvm-pdbdump-fuzzer.cpp => llvm-pdbutil/fuzzer/llvm-pdbutil-fuzzer.cpp} (96%) rename tools/{llvm-pdbdump/llvm-pdbdump.cpp => llvm-pdbutil/llvm-pdbutil.cpp} (99%) rename tools/{llvm-pdbdump/llvm-pdbdump.h => llvm-pdbutil/llvm-pdbutil.h} (98%) diff --git a/docs/ReleaseNotes.rst b/docs/ReleaseNotes.rst index 095262d7a5e..95025fb91c7 100644 --- a/docs/ReleaseNotes.rst +++ b/docs/ReleaseNotes.rst @@ -50,6 +50,10 @@ Non-comprehensive list of changes in this release structure and type definitions for DWARF, ELF, COFF, WASM, and MachO file formats. +* The tool ``llvm-pdbdump`` has been renamed ``llvm-pdbutil`` to better reflect + its nature as a general purpose PDB manipulation / diagnostics tool that does + more than just dumping contents. + * ... next change ... diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 25c340fea6f..b52b6018e02 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -61,7 +61,7 @@ set(LLVM_TEST_DEPENDS llvm-nm llvm-objdump llvm-opt-report - llvm-pdbdump + llvm-pdbutil llvm-profdata llvm-ranlib llvm-readobj diff --git a/test/DebugInfo/PDB/DIA/pdbdump-flags.test b/test/DebugInfo/PDB/DIA/pdbdump-flags.test index 9233e20ee82..02291c9afa9 100644 --- a/test/DebugInfo/PDB/DIA/pdbdump-flags.test +++ b/test/DebugInfo/PDB/DIA/pdbdump-flags.test @@ -1,7 +1,7 @@ -; RUN: llvm-pdbdump pretty %p/../Inputs/empty.pdb | FileCheck %s -check-prefix=NO_ARGS -; RUN: llvm-pdbdump pretty -types %p/../Inputs/empty.pdb | FileCheck %s -check-prefix=TYPES -; RUN: llvm-pdbdump pretty -compilands %p/../Inputs/empty.pdb | FileCheck %s -check-prefix=COMPILANDS -; RUN: llvm-pdbdump pretty -types -compilands %p/../Inputs/empty.pdb | FileCheck %s -check-prefix=MULTIPLE +; RUN: llvm-pdbutil pretty %p/../Inputs/empty.pdb | FileCheck %s -check-prefix=NO_ARGS +; RUN: llvm-pdbutil pretty -types %p/../Inputs/empty.pdb | FileCheck %s -check-prefix=TYPES +; RUN: llvm-pdbutil pretty -compilands %p/../Inputs/empty.pdb | FileCheck %s -check-prefix=COMPILANDS +; RUN: llvm-pdbutil pretty -types -compilands %p/../Inputs/empty.pdb | FileCheck %s -check-prefix=MULTIPLE ; Check that neither symbols nor compilands are dumped when neither argument specified. ; NO_ARGS: empty.pdb diff --git a/test/DebugInfo/PDB/DIA/pdbdump-linenumbers.test b/test/DebugInfo/PDB/DIA/pdbdump-linenumbers.test index 2a596e4af14..9556fb72edc 100644 --- a/test/DebugInfo/PDB/DIA/pdbdump-linenumbers.test +++ b/test/DebugInfo/PDB/DIA/pdbdump-linenumbers.test @@ -1,5 +1,5 @@ -; RUN: llvm-pdbdump pretty -lines %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=LINE_NUMS_FPO %s -; RUN: llvm-pdbdump pretty -lines %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=LINE_NUMS %s +; RUN: llvm-pdbutil pretty -lines %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=LINE_NUMS_FPO %s +; RUN: llvm-pdbutil pretty -lines %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=LINE_NUMS %s ; LINE_NUMS_FPO: llvm\test\debuginfo\pdb\inputs\symbolformat-fpo.cpp ; LINE_NUMS_FPO: Line 5, Address: [0x000011a0 - 0x000011a5] (6 bytes) diff --git a/test/DebugInfo/PDB/DIA/pdbdump-symbol-format.test b/test/DebugInfo/PDB/DIA/pdbdump-symbol-format.test index 997cdd9f6ba..536161586ff 100644 --- a/test/DebugInfo/PDB/DIA/pdbdump-symbol-format.test +++ b/test/DebugInfo/PDB/DIA/pdbdump-symbol-format.test @@ -1,11 +1,11 @@ -; RUN: llvm-pdbdump pretty -module-syms %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=SYM_FORMAT_FPO %s -; RUN: llvm-pdbdump pretty -module-syms %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=SYM_FORMAT %s -; RUN: llvm-pdbdump pretty -types %p/../Inputs/symbolformat.pdb > %t.types +; RUN: llvm-pdbutil pretty -module-syms %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=SYM_FORMAT_FPO %s +; RUN: llvm-pdbutil pretty -module-syms %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=SYM_FORMAT %s +; RUN: llvm-pdbutil pretty -types %p/../Inputs/symbolformat.pdb > %t.types ; RUN: FileCheck --check-prefix=TYPES_FORMAT %s < %t.types ; RUN: FileCheck --check-prefix=TYPES_1 %s < %t.types ; RUN: FileCheck --check-prefix=TYPES_2 %s < %t.types -; RUN: llvm-pdbdump pretty -types %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=TYPES_FORMAT %s -; RUN: llvm-pdbdump pretty -globals %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=GLOBALS %s +; RUN: llvm-pdbutil pretty -types %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=TYPES_FORMAT %s +; RUN: llvm-pdbutil pretty -globals %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=GLOBALS %s ; The format is func [0x+ - 0x-] ; SYM_FORMAT_FPO: ---SYMBOLS--- diff --git a/test/DebugInfo/PDB/Native/pdb-native-compilands.test b/test/DebugInfo/PDB/Native/pdb-native-compilands.test index 38234d719e5..2c7011c6570 100644 --- a/test/DebugInfo/PDB/Native/pdb-native-compilands.test +++ b/test/DebugInfo/PDB/Native/pdb-native-compilands.test @@ -1,7 +1,7 @@ ; Test that the native PDB reader can enumerate the compilands. -; RUN: llvm-pdbdump pretty -native -compilands %p/../Inputs/empty.pdb \ +; RUN: llvm-pdbutil pretty -native -compilands %p/../Inputs/empty.pdb \ ; RUN: | FileCheck -check-prefix=EMPTY %s -; RUN: llvm-pdbdump pretty -native -compilands %p/../Inputs/big-read.pdb \ +; RUN: llvm-pdbutil pretty -native -compilands %p/../Inputs/big-read.pdb \ ; RUN: | FileCheck -check-prefix=BIGREAD %s ; Reference output was generated with the DIA reader to ensure that the diff --git a/test/DebugInfo/PDB/Native/pdb-native-summary.test b/test/DebugInfo/PDB/Native/pdb-native-summary.test index bd32f198a39..116d2564fda 100644 --- a/test/DebugInfo/PDB/Native/pdb-native-summary.test +++ b/test/DebugInfo/PDB/Native/pdb-native-summary.test @@ -1,5 +1,5 @@ ; Test that the native PDB reader gets the PDB summary correct. -; RUN: llvm-pdbdump pretty -native -color-output=false %p/../Inputs/empty.pdb \ +; RUN: llvm-pdbutil pretty -native -color-output=false %p/../Inputs/empty.pdb \ ; RUN: | FileCheck -check-prefix=EMPTY %s ; Reference output was generated with the DIA reader to ensure that the diff --git a/test/DebugInfo/PDB/pdb-longname-truncation.test b/test/DebugInfo/PDB/pdb-longname-truncation.test index 2e0284fbe91..06eae8ea226 100644 --- a/test/DebugInfo/PDB/pdb-longname-truncation.test +++ b/test/DebugInfo/PDB/pdb-longname-truncation.test @@ -1,3 +1,3 @@ ; For now just verify that this doesn't cause an error. Later we pdbdump can ; do type lookup, we can verify that the name matches what we expect. -; RUN: llvm-pdbdump yaml2pdb -pdb=%t.pdb %p/Inputs/longname-truncation.yaml +; RUN: llvm-pdbutil yaml2pdb -pdb=%t.pdb %p/Inputs/longname-truncation.yaml diff --git a/test/DebugInfo/PDB/pdb-minimal-construct.test b/test/DebugInfo/PDB/pdb-minimal-construct.test index e43b5fe8ff9..326c6cf9231 100644 --- a/test/DebugInfo/PDB/pdb-minimal-construct.test +++ b/test/DebugInfo/PDB/pdb-minimal-construct.test @@ -6,6 +6,6 @@ ; resulting PDB to go back to yaml, and verify that the resulting yaml ; is identical. -; RUN: llvm-pdbdump yaml2pdb -pdb=%t.pdb %p/Inputs/one-symbol.yaml -; RUN: llvm-pdbdump pdb2yaml -minimal -module-syms -no-file-headers %t.pdb > %t.pdb.yaml +; RUN: llvm-pdbutil yaml2pdb -pdb=%t.pdb %p/Inputs/one-symbol.yaml +; RUN: llvm-pdbutil pdb2yaml -minimal -module-syms -no-file-headers %t.pdb > %t.pdb.yaml ; RUN: diff -b %p/Inputs/one-symbol.yaml %t.pdb.yaml diff --git a/test/DebugInfo/PDB/pdb-yaml-symbols.test b/test/DebugInfo/PDB/pdb-yaml-symbols.test index 66addae60a3..574065176b5 100644 --- a/test/DebugInfo/PDB/pdb-yaml-symbols.test +++ b/test/DebugInfo/PDB/pdb-yaml-symbols.test @@ -1,4 +1,4 @@ -; RUN: llvm-pdbdump pdb2yaml -module-syms %p/Inputs/empty.pdb \ +; RUN: llvm-pdbutil pdb2yaml -module-syms %p/Inputs/empty.pdb \ ; RUN: | FileCheck -check-prefix=YAML %s diff --git a/test/DebugInfo/PDB/pdb-yaml-types.test b/test/DebugInfo/PDB/pdb-yaml-types.test index b3108591271..f65d9edaa54 100644 --- a/test/DebugInfo/PDB/pdb-yaml-types.test +++ b/test/DebugInfo/PDB/pdb-yaml-types.test @@ -1,7 +1,7 @@ -RUN: llvm-pdbdump pdb2yaml -tpi-stream %p/Inputs/big-read.pdb > %t.yaml +RUN: llvm-pdbutil pdb2yaml -tpi-stream %p/Inputs/big-read.pdb > %t.yaml RUN: FileCheck -check-prefix=YAML %s < %t.yaml -RUN: llvm-pdbdump yaml2pdb %t.yaml -pdb %t.pdb -RUN: llvm-pdbdump raw -tpi-records %t.pdb | FileCheck %s --check-prefix=PDB +RUN: llvm-pdbutil yaml2pdb %t.yaml -pdb %t.pdb +RUN: llvm-pdbutil raw -tpi-records %t.pdb | FileCheck %s --check-prefix=PDB Only verify the beginning of the type stream. diff --git a/test/DebugInfo/PDB/pdbdump-debug-subsections.test b/test/DebugInfo/PDB/pdbdump-debug-subsections.test index 903f51d7faf..52f7bb52da2 100644 --- a/test/DebugInfo/PDB/pdbdump-debug-subsections.test +++ b/test/DebugInfo/PDB/pdbdump-debug-subsections.test @@ -1,6 +1,6 @@ -; RUN: llvm-pdbdump yaml2pdb -pdb=%t.pdb %p/Inputs/debug-subsections.yaml -; RUN: llvm-pdbdump pdb2yaml -all -no-file-headers %t.pdb | FileCheck --check-prefix=YAML %s -; RUN: llvm-pdbdump raw -subsections=all %t.pdb | FileCheck --check-prefix=RAW %s +; RUN: llvm-pdbutil yaml2pdb -pdb=%t.pdb %p/Inputs/debug-subsections.yaml +; RUN: llvm-pdbutil pdb2yaml -all -no-file-headers %t.pdb | FileCheck --check-prefix=YAML %s +; RUN: llvm-pdbutil raw -subsections=all %t.pdb | FileCheck --check-prefix=RAW %s YAML: Modules: YAML-NEXT: - Module: Foo.obj diff --git a/test/DebugInfo/PDB/pdbdump-headers.test b/test/DebugInfo/PDB/pdbdump-headers.test index 0a9c48ca1b2..82fe91dd20a 100644 --- a/test/DebugInfo/PDB/pdbdump-headers.test +++ b/test/DebugInfo/PDB/pdbdump-headers.test @@ -1,12 +1,12 @@ -; RUN: llvm-pdbdump raw -headers -string-table -tpi-records -tpi-record-bytes -module-syms \ +; RUN: llvm-pdbutil raw -headers -string-table -tpi-records -tpi-record-bytes -module-syms \ ; RUN: -sym-record-bytes -globals -publics -module-files \ ; RUN: -stream-summary -stream-blocks -ipi-records -ipi-record-bytes \ ; RUN: -section-contribs -section-map -section-headers -subsections=all \ ; RUN: -tpi-hash -fpo -page-stats %p/Inputs/empty.pdb | FileCheck -check-prefix=EMPTY %s -; RUN: llvm-pdbdump raw -all %p/Inputs/empty.pdb | FileCheck -check-prefix=ALL %s -; RUN: llvm-pdbdump raw -headers -modules -module-files \ +; RUN: llvm-pdbutil raw -all %p/Inputs/empty.pdb | FileCheck -check-prefix=ALL %s +; RUN: llvm-pdbutil raw -headers -modules -module-files \ ; RUN: %p/Inputs/big-read.pdb | FileCheck -check-prefix=BIG %s -; RUN: not llvm-pdbdump raw -headers %p/Inputs/bad-block-size.pdb 2>&1 | FileCheck -check-prefix=BAD-BLOCK-SIZE %s +; RUN: not llvm-pdbutil raw -headers %p/Inputs/bad-block-size.pdb 2>&1 | FileCheck -check-prefix=BAD-BLOCK-SIZE %s ; EMPTY: FileHeaders { ; EMPTY-NEXT: BlockSize: 4096 diff --git a/test/DebugInfo/PDB/pdbdump-merge-ids-and-types.test b/test/DebugInfo/PDB/pdbdump-merge-ids-and-types.test index ac32ce040b9..2639490f542 100644 --- a/test/DebugInfo/PDB/pdbdump-merge-ids-and-types.test +++ b/test/DebugInfo/PDB/pdbdump-merge-ids-and-types.test @@ -1,12 +1,12 @@ -; RUN: llvm-pdbdump yaml2pdb -pdb=%t.1.pdb %p/Inputs/merge-ids-and-types-1.yaml -; RUN: llvm-pdbdump yaml2pdb -pdb=%t.2.pdb %p/Inputs/merge-ids-and-types-2.yaml -; RUN: llvm-pdbdump merge -pdb=%t.3.pdb %t.1.pdb %t.2.pdb -; RUN: llvm-pdbdump raw -tpi-records %t.3.pdb | FileCheck -check-prefix=TPI-TYPES %s -; RUN: llvm-pdbdump raw -tpi-records %t.3.pdb | FileCheck -check-prefix=INTMAIN %s -; RUN: llvm-pdbdump raw -tpi-records %t.3.pdb | FileCheck -check-prefix=VOIDMAIN %s -; RUN: llvm-pdbdump raw -ipi-records %t.3.pdb | FileCheck -check-prefix=IPI-TYPES %s -; RUN: llvm-pdbdump raw -ipi-records %t.3.pdb | FileCheck -check-prefix=IPI-NAMES %s -; RUN: llvm-pdbdump raw -ipi-records %t.3.pdb | FileCheck -check-prefix=IPI-UDT %s +; RUN: llvm-pdbutil yaml2pdb -pdb=%t.1.pdb %p/Inputs/merge-ids-and-types-1.yaml +; RUN: llvm-pdbutil yaml2pdb -pdb=%t.2.pdb %p/Inputs/merge-ids-and-types-2.yaml +; RUN: llvm-pdbutil merge -pdb=%t.3.pdb %t.1.pdb %t.2.pdb +; RUN: llvm-pdbutil raw -tpi-records %t.3.pdb | FileCheck -check-prefix=TPI-TYPES %s +; RUN: llvm-pdbutil raw -tpi-records %t.3.pdb | FileCheck -check-prefix=INTMAIN %s +; RUN: llvm-pdbutil raw -tpi-records %t.3.pdb | FileCheck -check-prefix=VOIDMAIN %s +; RUN: llvm-pdbutil raw -ipi-records %t.3.pdb | FileCheck -check-prefix=IPI-TYPES %s +; RUN: llvm-pdbutil raw -ipi-records %t.3.pdb | FileCheck -check-prefix=IPI-NAMES %s +; RUN: llvm-pdbutil raw -ipi-records %t.3.pdb | FileCheck -check-prefix=IPI-UDT %s TPI-TYPES: Type Info Stream (TPI) TPI-TYPES: Record count: 9 diff --git a/test/DebugInfo/PDB/pdbdump-mergeids.test b/test/DebugInfo/PDB/pdbdump-mergeids.test index 6a4d19eba04..1c0a8704af2 100644 --- a/test/DebugInfo/PDB/pdbdump-mergeids.test +++ b/test/DebugInfo/PDB/pdbdump-mergeids.test @@ -1,9 +1,9 @@ -; RUN: llvm-pdbdump yaml2pdb -pdb=%t.1.pdb %p/Inputs/merge-ids-1.yaml -; RUN: llvm-pdbdump yaml2pdb -pdb=%t.2.pdb %p/Inputs/merge-ids-2.yaml -; RUN: llvm-pdbdump merge -pdb=%t.3.pdb %t.1.pdb %t.2.pdb -; RUN: llvm-pdbdump raw -ipi-records %t.3.pdb | FileCheck -check-prefix=MERGED %s -; RUN: llvm-pdbdump raw -ipi-records %t.3.pdb | FileCheck -check-prefix=SUBSTRS %s -; RUN: llvm-pdbdump raw -tpi-records %t.3.pdb | FileCheck -check-prefix=TPI-EMPTY %s +; RUN: llvm-pdbutil yaml2pdb -pdb=%t.1.pdb %p/Inputs/merge-ids-1.yaml +; RUN: llvm-pdbutil yaml2pdb -pdb=%t.2.pdb %p/Inputs/merge-ids-2.yaml +; RUN: llvm-pdbutil merge -pdb=%t.3.pdb %t.1.pdb %t.2.pdb +; RUN: llvm-pdbutil raw -ipi-records %t.3.pdb | FileCheck -check-prefix=MERGED %s +; RUN: llvm-pdbutil raw -ipi-records %t.3.pdb | FileCheck -check-prefix=SUBSTRS %s +; RUN: llvm-pdbutil raw -tpi-records %t.3.pdb | FileCheck -check-prefix=TPI-EMPTY %s MERGED: Type Info Stream (IPI) diff --git a/test/DebugInfo/PDB/pdbdump-mergetypes.test b/test/DebugInfo/PDB/pdbdump-mergetypes.test index a26b9263182..8d32b4d176f 100644 --- a/test/DebugInfo/PDB/pdbdump-mergetypes.test +++ b/test/DebugInfo/PDB/pdbdump-mergetypes.test @@ -1,8 +1,8 @@ -; RUN: llvm-pdbdump yaml2pdb -pdb=%t.1.pdb %p/Inputs/merge-types-1.yaml -; RUN: llvm-pdbdump yaml2pdb -pdb=%t.2.pdb %p/Inputs/merge-types-2.yaml -; RUN: llvm-pdbdump merge -pdb=%t.3.pdb %t.1.pdb %t.2.pdb -; RUN: llvm-pdbdump raw -tpi-records %t.3.pdb | FileCheck -check-prefix=MERGED %s -; RUN: llvm-pdbdump raw -tpi-records %t.3.pdb | FileCheck -check-prefix=ARGLIST %s +; RUN: llvm-pdbutil yaml2pdb -pdb=%t.1.pdb %p/Inputs/merge-types-1.yaml +; RUN: llvm-pdbutil yaml2pdb -pdb=%t.2.pdb %p/Inputs/merge-types-2.yaml +; RUN: llvm-pdbutil merge -pdb=%t.3.pdb %t.1.pdb %t.2.pdb +; RUN: llvm-pdbutil raw -tpi-records %t.3.pdb | FileCheck -check-prefix=MERGED %s +; RUN: llvm-pdbutil raw -tpi-records %t.3.pdb | FileCheck -check-prefix=ARGLIST %s MERGED: Type Info Stream (TPI) diff --git a/test/DebugInfo/PDB/pdbdump-raw-blocks.test b/test/DebugInfo/PDB/pdbdump-raw-blocks.test index b43df970e5d..14e1f86fc02 100644 --- a/test/DebugInfo/PDB/pdbdump-raw-blocks.test +++ b/test/DebugInfo/PDB/pdbdump-raw-blocks.test @@ -1,8 +1,8 @@ -; RUN: llvm-pdbdump raw -block-data=0 %p/Inputs/empty.pdb | FileCheck --check-prefix=BLOCK0 %s -; RUN: llvm-pdbdump raw -block-data=0-1 %p/Inputs/empty.pdb | FileCheck --check-prefix=BLOCK01 %s -; RUN: not llvm-pdbdump raw -block-data=0,1 %p/Inputs/empty.pdb 2>&1 | FileCheck --check-prefix=BADSYNTAX %s -; RUN: not llvm-pdbdump raw -block-data=0a1 %p/Inputs/empty.pdb 2>&1 | FileCheck --check-prefix=BADSYNTAX %s -; RUN: not llvm-pdbdump raw -block-data=0- %p/Inputs/empty.pdb 2>&1 | FileCheck --check-prefix=BADSYNTAX %s +; RUN: llvm-pdbutil raw -block-data=0 %p/Inputs/empty.pdb | FileCheck --check-prefix=BLOCK0 %s +; RUN: llvm-pdbutil raw -block-data=0-1 %p/Inputs/empty.pdb | FileCheck --check-prefix=BLOCK01 %s +; RUN: not llvm-pdbutil raw -block-data=0,1 %p/Inputs/empty.pdb 2>&1 | FileCheck --check-prefix=BADSYNTAX %s +; RUN: not llvm-pdbutil raw -block-data=0a1 %p/Inputs/empty.pdb 2>&1 | FileCheck --check-prefix=BADSYNTAX %s +; RUN: not llvm-pdbutil raw -block-data=0- %p/Inputs/empty.pdb 2>&1 | FileCheck --check-prefix=BADSYNTAX %s BLOCK0: Block Data { BLOCK0-NEXT: Block 0 ( diff --git a/test/DebugInfo/PDB/pdbdump-raw-stream.test b/test/DebugInfo/PDB/pdbdump-raw-stream.test index 6b6624f1601..846960a0964 100644 --- a/test/DebugInfo/PDB/pdbdump-raw-stream.test +++ b/test/DebugInfo/PDB/pdbdump-raw-stream.test @@ -1,5 +1,5 @@ -; RUN: llvm-pdbdump raw -stream-data=1 %p/Inputs/empty.pdb | FileCheck --check-prefix=STREAM1 %s -; RUN: not llvm-pdbdump raw -stream-data=100 %p/Inputs/empty.pdb 2>&1 | FileCheck --check-prefix=INVALIDSTREAM %s +; RUN: llvm-pdbutil raw -stream-data=1 %p/Inputs/empty.pdb | FileCheck --check-prefix=STREAM1 %s +; RUN: not llvm-pdbutil raw -stream-data=100 %p/Inputs/empty.pdb 2>&1 | FileCheck --check-prefix=INVALIDSTREAM %s STREAM1: Stream Data { STREAM1-NEXT: Stream { diff --git a/test/DebugInfo/PDB/pdbdump-readwrite.test b/test/DebugInfo/PDB/pdbdump-readwrite.test index ad075901431..ee53f3b4cd2 100644 --- a/test/DebugInfo/PDB/pdbdump-readwrite.test +++ b/test/DebugInfo/PDB/pdbdump-readwrite.test @@ -1,10 +1,10 @@ -RUN: llvm-pdbdump pdb2yaml -modules -module-files -dbi-stream \ +RUN: llvm-pdbutil pdb2yaml -modules -module-files -dbi-stream \ RUN: -pdb-stream -string-table -tpi-stream -stream-directory \ RUN: -stream-metadata %p/Inputs/empty.pdb > %t.1 -RUN: llvm-pdbdump yaml2pdb -pdb=%t.2 %t.1 +RUN: llvm-pdbutil yaml2pdb -pdb=%t.2 %t.1 -RUN: llvm-pdbdump raw -headers -string-table -tpi-records %p/Inputs/empty.pdb | FileCheck %s -RUN: llvm-pdbdump raw -headers -string-table -tpi-records %t.2 | FileCheck %s +RUN: llvm-pdbutil raw -headers -string-table -tpi-records %p/Inputs/empty.pdb | FileCheck %s +RUN: llvm-pdbutil raw -headers -string-table -tpi-records %t.2 | FileCheck %s CHECK: FileHeaders { CHECK-NEXT: BlockSize: 4096 diff --git a/test/DebugInfo/PDB/pdbdump-source-names.test b/test/DebugInfo/PDB/pdbdump-source-names.test index 1f17eb2e9ff..f16a2699a15 100644 --- a/test/DebugInfo/PDB/pdbdump-source-names.test +++ b/test/DebugInfo/PDB/pdbdump-source-names.test @@ -6,11 +6,11 @@ # that differ by one byte, so that at least one of those will only # pass if alignment is implemented correctly. -RUN: llvm-pdbdump yaml2pdb -pdb=%T/source-names-1.pdb %p/Inputs/source-names-1.yaml -RUN: llvm-pdbdump pdb2yaml -module-files %T/source-names-1.pdb \ +RUN: llvm-pdbutil yaml2pdb -pdb=%T/source-names-1.pdb %p/Inputs/source-names-1.yaml +RUN: llvm-pdbutil pdb2yaml -module-files %T/source-names-1.pdb \ RUN: | FileCheck -check-prefix=CHECK1 %s -RUN: llvm-pdbdump yaml2pdb -pdb=%T/source-names-2.pdb %p/Inputs/source-names-2.yaml -RUN: llvm-pdbdump pdb2yaml -module-files %T/source-names-2.pdb \ +RUN: llvm-pdbutil yaml2pdb -pdb=%T/source-names-2.pdb %p/Inputs/source-names-2.yaml +RUN: llvm-pdbutil pdb2yaml -module-files %T/source-names-2.pdb \ RUN: | FileCheck -check-prefix=CHECK2 %s CHECK1: SourceFiles: diff --git a/test/DebugInfo/PDB/pdbdump-write.test b/test/DebugInfo/PDB/pdbdump-write.test index 5e85974cf40..b6d1959abe6 100644 --- a/test/DebugInfo/PDB/pdbdump-write.test +++ b/test/DebugInfo/PDB/pdbdump-write.test @@ -10,11 +10,11 @@ ; stream metadata, since the layout of the MSF file might be different ; (for example if we don't write the entire stream) ; -; RUN: llvm-pdbdump pdb2yaml -stream-metadata -stream-directory \ +; RUN: llvm-pdbutil pdb2yaml -stream-metadata -stream-directory \ ; RUN: -pdb-stream -tpi-stream -module-syms %p/Inputs/empty.pdb > %t.1 -; RUN: llvm-pdbdump yaml2pdb -pdb=%t.2 %t.1 -; RUN: llvm-pdbdump pdb2yaml -pdb-stream -tpi-stream \ +; RUN: llvm-pdbutil yaml2pdb -pdb=%t.2 %t.1 +; RUN: llvm-pdbutil pdb2yaml -pdb-stream -tpi-stream \ ; RUN: -module-syms -no-file-headers %p/Inputs/empty.pdb > %t.3 -; RUN: llvm-pdbdump pdb2yaml -pdb-stream -tpi-stream \ +; RUN: llvm-pdbutil pdb2yaml -pdb-stream -tpi-stream \ ; RUN: -module-syms -no-file-headers %t.2 > %t.4 ; RUN: diff %t.3 %t.4 diff --git a/test/DebugInfo/PDB/pdbdump-yaml-types.test b/test/DebugInfo/PDB/pdbdump-yaml-types.test index 7e6fcc1ca42..a01edcee1e9 100644 --- a/test/DebugInfo/PDB/pdbdump-yaml-types.test +++ b/test/DebugInfo/PDB/pdbdump-yaml-types.test @@ -1,4 +1,4 @@ -; RUN: llvm-pdbdump pdb2yaml -tpi-stream %p/Inputs/empty.pdb \ +; RUN: llvm-pdbutil pdb2yaml -tpi-stream %p/Inputs/empty.pdb \ ; RUN: | FileCheck -check-prefix=YAML %s YAML: --- diff --git a/test/DebugInfo/PDB/pdbdump-yaml.test b/test/DebugInfo/PDB/pdbdump-yaml.test index 44025be5bca..0563230cf47 100644 --- a/test/DebugInfo/PDB/pdbdump-yaml.test +++ b/test/DebugInfo/PDB/pdbdump-yaml.test @@ -1,6 +1,6 @@ -; RUN: llvm-pdbdump pdb2yaml -stream-metadata -stream-directory -string-table -pdb-stream \ +; RUN: llvm-pdbutil pdb2yaml -stream-metadata -stream-directory -string-table -pdb-stream \ ; RUN: %p/Inputs/empty.pdb | FileCheck -check-prefix=YAML %s -; RUN: llvm-pdbdump pdb2yaml -no-file-headers -stream-metadata -stream-directory -pdb-stream \ +; RUN: llvm-pdbutil pdb2yaml -no-file-headers -stream-metadata -stream-directory -pdb-stream \ ; RUN: %p/Inputs/empty.pdb | FileCheck -check-prefix=NO-HEADERS %s ; YAML: --- diff --git a/test/tools/llvm-pdbdump/class-layout.test b/test/tools/llvm-pdbdump/class-layout.test index 4a69c17db2b..7a08194c500 100644 --- a/test/tools/llvm-pdbdump/class-layout.test +++ b/test/tools/llvm-pdbdump/class-layout.test @@ -1,4 +1,4 @@ -; RUN: llvm-pdbdump pretty -all -class-recurse-depth=1 \ +; RUN: llvm-pdbutil pretty -all -class-recurse-depth=1 \ ; RUN: %p/Inputs/ClassLayoutTest.pdb > %t ; RUN: FileCheck -input-file=%t %s -check-prefix=GLOBALS_TEST ; RUN: FileCheck -input-file=%t %s -check-prefix=MEMBERS_TEST diff --git a/test/tools/llvm-pdbdump/complex-padding-graphical.test b/test/tools/llvm-pdbdump/complex-padding-graphical.test index a23321fe012..9373c1ec6c2 100644 --- a/test/tools/llvm-pdbdump/complex-padding-graphical.test +++ b/test/tools/llvm-pdbdump/complex-padding-graphical.test @@ -1,4 +1,4 @@ -; RUN: llvm-pdbdump pretty -classes -class-definitions=layout \ +; RUN: llvm-pdbutil pretty -classes -class-definitions=layout \ ; RUN: -include-types=Test %p/Inputs/ComplexPaddingTest.pdb > %t ; RUN: FileCheck -input-file=%t %s -check-prefix=DIRECT_VB_ONLY diff --git a/test/tools/llvm-pdbdump/enum-layout.test b/test/tools/llvm-pdbdump/enum-layout.test index df447c65bba..5813321f000 100644 --- a/test/tools/llvm-pdbdump/enum-layout.test +++ b/test/tools/llvm-pdbdump/enum-layout.test @@ -1,4 +1,4 @@ -; RUN: llvm-pdbdump pretty -types %p/Inputs/ClassLayoutTest.pdb > %t +; RUN: llvm-pdbutil pretty -types %p/Inputs/ClassLayoutTest.pdb > %t ; RUN: FileCheck -input-file=%t %s -check-prefix=GLOBAL_ENUM ; RUN: FileCheck -input-file=%t %s -check-prefix=MEMBER_ENUM diff --git a/test/tools/llvm-pdbdump/load-address.test b/test/tools/llvm-pdbdump/load-address.test index 5791637d3a7..4402790d71f 100644 --- a/test/tools/llvm-pdbdump/load-address.test +++ b/test/tools/llvm-pdbdump/load-address.test @@ -1,6 +1,6 @@ -; RUN: llvm-pdbdump pretty -externals %p/Inputs/LoadAddressTest.pdb \ +; RUN: llvm-pdbutil pretty -externals %p/Inputs/LoadAddressTest.pdb \ ; RUN: | FileCheck --check-prefix=RVA %s -; RUN: llvm-pdbdump pretty -externals -load-address=0x40000000 \ +; RUN: llvm-pdbutil pretty -externals -load-address=0x40000000 \ ; RUN: %p/Inputs/LoadAddressTest.pdb | FileCheck --check-prefix=VA %s ; RVA: ---EXTERNALS--- diff --git a/test/tools/llvm-pdbdump/raw-stream-data.test b/test/tools/llvm-pdbdump/raw-stream-data.test index d55980632d4..1d7c23fe367 100644 --- a/test/tools/llvm-pdbdump/raw-stream-data.test +++ b/test/tools/llvm-pdbdump/raw-stream-data.test @@ -1,8 +1,8 @@ -; RUN: llvm-pdbdump raw -stream-data=8 %p/Inputs/LoadAddressTest.pdb \ +; RUN: llvm-pdbutil raw -stream-data=8 %p/Inputs/LoadAddressTest.pdb \ ; RUN: | FileCheck %s -check-prefix=FULL_STREAM -; RUN: llvm-pdbdump raw -stream-data=8:4 %p/Inputs/LoadAddressTest.pdb \ +; RUN: llvm-pdbutil raw -stream-data=8:4 %p/Inputs/LoadAddressTest.pdb \ ; RUN: | FileCheck %s -check-prefix=OFFSET_STREAM -; RUN: llvm-pdbdump raw -stream-data=8:4@24 %p/Inputs/LoadAddressTest.pdb \ +; RUN: llvm-pdbutil raw -stream-data=8:4@24 %p/Inputs/LoadAddressTest.pdb \ ; RUN: | FileCheck %s -check-prefix=OFFSET_AND_LENGTH FULL_STREAM: Stream Data { diff --git a/test/tools/llvm-pdbdump/regex-filter.test b/test/tools/llvm-pdbdump/regex-filter.test index 36c3da33e2e..fb8ca7fa189 100644 --- a/test/tools/llvm-pdbdump/regex-filter.test +++ b/test/tools/llvm-pdbdump/regex-filter.test @@ -1,25 +1,25 @@ -; RUN: llvm-pdbdump pretty -module-syms -globals -types %p/Inputs/FilterTest.pdb \ +; RUN: llvm-pdbutil pretty -module-syms -globals -types %p/Inputs/FilterTest.pdb \ ; RUN: | FileCheck --check-prefix=NO_FILTER %s -; RUN: llvm-pdbdump pretty -types -exclude-types="GlobalTypedef|NestedTypedef" \ +; RUN: llvm-pdbutil pretty -types -exclude-types="GlobalTypedef|NestedTypedef" \ ; RUN: %p/Inputs/FilterTest.pdb | FileCheck --check-prefix=EXCLUDE_TYPEDEFS %s -; RUN: llvm-pdbdump pretty -classes -enums %p/Inputs/FilterTest.pdb \ +; RUN: llvm-pdbutil pretty -classes -enums %p/Inputs/FilterTest.pdb \ ; RUN: | FileCheck --check-prefix=EXCLUDE_TYPEDEFS %s -; RUN: llvm-pdbdump pretty -types -exclude-types="GlobalEnum|NestedEnum" \ +; RUN: llvm-pdbutil pretty -types -exclude-types="GlobalEnum|NestedEnum" \ ; RUN: %p/Inputs/FilterTest.pdb | FileCheck --check-prefix=EXCLUDE_ENUMS %s -; RUN: llvm-pdbdump pretty -classes -typedefs %p/Inputs/FilterTest.pdb \ +; RUN: llvm-pdbutil pretty -classes -typedefs %p/Inputs/FilterTest.pdb \ ; RUN: | FileCheck --check-prefix=EXCLUDE_ENUMS %s -; RUN: llvm-pdbdump pretty -types -module-syms -globals -exclude-symbols="MemberVar|GlobalVar" \ +; RUN: llvm-pdbutil pretty -types -module-syms -globals -exclude-symbols="MemberVar|GlobalVar" \ ; RUN: %p/Inputs/FilterTest.pdb | FileCheck --check-prefix=EXCLUDE_VARS %s -; RUN: llvm-pdbdump pretty -types -exclude-types="FilterTestClass" \ +; RUN: llvm-pdbutil pretty -types -exclude-types="FilterTestClass" \ ; RUN: %p/Inputs/FilterTest.pdb | FileCheck --check-prefix=EXCLUDE_WHOLE_CLASS %s -; RUN: llvm-pdbdump pretty -module-syms -globals -exclude-compilands="FilterTest.obj" \ +; RUN: llvm-pdbutil pretty -module-syms -globals -exclude-compilands="FilterTest.obj" \ ; RUN: %p/Inputs/FilterTest.pdb | FileCheck --check-prefix=EXCLUDE_COMPILAND %s -; RUN: llvm-pdbdump pretty -types -include-types="FilterTestClass" \ +; RUN: llvm-pdbutil pretty -types -include-types="FilterTestClass" \ ; RUN: %p/Inputs/FilterTest.pdb | FileCheck --check-prefix=INCLUDE_ONLY_TYPES %s -; RUN: llvm-pdbdump pretty -types -module-syms -globals -include-symbols="[[:<:]](IntGlobalVar|DoubleGlobalVar)[[:>:]]" \ +; RUN: llvm-pdbutil pretty -types -module-syms -globals -include-symbols="[[:<:]](IntGlobalVar|DoubleGlobalVar)[[:>:]]" \ ; RUN: %p/Inputs/FilterTest.pdb | FileCheck --check-prefix=INCLUDE_ONLY_VARS %s ; NO_FILTER: ---TYPES--- diff --git a/test/tools/llvm-pdbdump/simple-padding-graphical.test b/test/tools/llvm-pdbdump/simple-padding-graphical.test index 0e19f9cc701..91da534ca01 100644 --- a/test/tools/llvm-pdbdump/simple-padding-graphical.test +++ b/test/tools/llvm-pdbdump/simple-padding-graphical.test @@ -1,4 +1,4 @@ -; RUN: llvm-pdbdump pretty -classes -class-definitions=layout \ +; RUN: llvm-pdbutil pretty -classes -class-definitions=layout \ ; RUN: -include-types=SimplePad %p/Inputs/SimplePaddingTest.pdb > %t ; RUN: FileCheck -input-file=%t %s -check-prefix=NO_PADDING diff --git a/test/tools/llvm-pdbdump/symbol-filters.test b/test/tools/llvm-pdbdump/symbol-filters.test index d12d2aa8be0..80c24baf17c 100644 --- a/test/tools/llvm-pdbdump/symbol-filters.test +++ b/test/tools/llvm-pdbdump/symbol-filters.test @@ -1,25 +1,25 @@ -; RUN: llvm-pdbdump pretty -globals -module-syms -sym-types=data %p/Inputs/FilterTest.pdb \ +; RUN: llvm-pdbutil pretty -globals -module-syms -sym-types=data %p/Inputs/FilterTest.pdb \ ; RUN: | FileCheck --check-prefix=ONLY_DATA %s -; RUN: llvm-pdbdump pretty -globals -module-syms -sym-types=thunks %p/Inputs/FilterTest.pdb \ +; RUN: llvm-pdbutil pretty -globals -module-syms -sym-types=thunks %p/Inputs/FilterTest.pdb \ ; RUN: | FileCheck --check-prefix=ONLY_THUNKS %s -; RUN: llvm-pdbdump pretty -globals -module-syms -sym-types=funcs %p/Inputs/FilterTest.pdb \ +; RUN: llvm-pdbutil pretty -globals -module-syms -sym-types=funcs %p/Inputs/FilterTest.pdb \ ; RUN: | FileCheck --check-prefix=ONLY_FUNCS %s -; RUN: llvm-pdbdump pretty -globals -module-syms -sym-types=funcs -sym-types=data \ +; RUN: llvm-pdbutil pretty -globals -module-syms -sym-types=funcs -sym-types=data \ ; RUN: %p/Inputs/FilterTest.pdb | FileCheck --check-prefix=TWO_TYPES %s -; RUN: llvm-pdbdump pretty -globals -module-syms -sym-types=data \ +; RUN: llvm-pdbutil pretty -globals -module-syms -sym-types=data \ ; RUN: -symbol-order=name %p/Inputs/FilterTest.pdb | FileCheck --check-prefix=NAME_SORT_DATA %s -; RUN: llvm-pdbdump pretty -globals -module-syms -sym-types=data \ +; RUN: llvm-pdbutil pretty -globals -module-syms -sym-types=data \ ; RUN: -symbol-order=size %p/Inputs/FilterTest.pdb | FileCheck --check-prefix=SIZE_SORT_DATA %s -; RUN: llvm-pdbdump pretty -globals -module-syms -sym-types=funcs \ +; RUN: llvm-pdbutil pretty -globals -module-syms -sym-types=funcs \ ; RUN: -symbol-order=name %p/Inputs/FilterTest.pdb | FileCheck --check-prefix=NAME_SORT_FUNCS %s -; RUN: llvm-pdbdump pretty -globals -module-syms -sym-types=funcs \ +; RUN: llvm-pdbutil pretty -globals -module-syms -sym-types=funcs \ ; RUN: -symbol-order=size %p/Inputs/FilterTest.pdb | FileCheck --check-prefix=SIZE_SORT_FUNCS %s ; ONLY_DATA-NOT: func diff --git a/tools/LLVMBuild.txt b/tools/LLVMBuild.txt index e3041a6d40d..bcf58842eac 100644 --- a/tools/LLVMBuild.txt +++ b/tools/LLVMBuild.txt @@ -40,7 +40,7 @@ subdirectories = llvm-modextract llvm-nm llvm-objdump - llvm-pdbdump + llvm-pdbutil llvm-profdata llvm-rtdyld llvm-size diff --git a/tools/llvm-pdbdump/Analyze.cpp b/tools/llvm-pdbutil/Analyze.cpp similarity index 100% rename from tools/llvm-pdbdump/Analyze.cpp rename to tools/llvm-pdbutil/Analyze.cpp diff --git a/tools/llvm-pdbdump/Analyze.h b/tools/llvm-pdbutil/Analyze.h similarity index 100% rename from tools/llvm-pdbdump/Analyze.h rename to tools/llvm-pdbutil/Analyze.h diff --git a/tools/llvm-pdbdump/CMakeLists.txt b/tools/llvm-pdbutil/CMakeLists.txt similarity index 93% rename from tools/llvm-pdbdump/CMakeLists.txt rename to tools/llvm-pdbutil/CMakeLists.txt index 020331e6550..9875dfb5a25 100644 --- a/tools/llvm-pdbdump/CMakeLists.txt +++ b/tools/llvm-pdbutil/CMakeLists.txt @@ -7,11 +7,11 @@ set(LLVM_LINK_COMPONENTS Support ) -add_llvm_tool(llvm-pdbdump +add_llvm_tool(llvm-pdbutil Analyze.cpp CompactTypeDumpVisitor.cpp Diff.cpp - llvm-pdbdump.cpp + llvm-pdbutil.cpp LinePrinter.cpp LLVMOutputStyle.cpp PdbYaml.cpp diff --git a/tools/llvm-pdbdump/CompactTypeDumpVisitor.cpp b/tools/llvm-pdbutil/CompactTypeDumpVisitor.cpp similarity index 100% rename from tools/llvm-pdbdump/CompactTypeDumpVisitor.cpp rename to tools/llvm-pdbutil/CompactTypeDumpVisitor.cpp diff --git a/tools/llvm-pdbdump/CompactTypeDumpVisitor.h b/tools/llvm-pdbutil/CompactTypeDumpVisitor.h similarity index 100% rename from tools/llvm-pdbdump/CompactTypeDumpVisitor.h rename to tools/llvm-pdbutil/CompactTypeDumpVisitor.h diff --git a/tools/llvm-pdbdump/Diff.cpp b/tools/llvm-pdbutil/Diff.cpp similarity index 99% rename from tools/llvm-pdbdump/Diff.cpp rename to tools/llvm-pdbutil/Diff.cpp index 418c2361ac3..3fe6c511d35 100644 --- a/tools/llvm-pdbdump/Diff.cpp +++ b/tools/llvm-pdbutil/Diff.cpp @@ -10,7 +10,7 @@ #include "Diff.h" #include "StreamUtil.h" -#include "llvm-pdbdump.h" +#include "llvm-pdbutil.h" #include "llvm/DebugInfo/PDB/Native/Formatters.h" #include "llvm/DebugInfo/PDB/Native/InfoStream.h" diff --git a/tools/llvm-pdbdump/Diff.h b/tools/llvm-pdbutil/Diff.h similarity index 100% rename from tools/llvm-pdbdump/Diff.h rename to tools/llvm-pdbutil/Diff.h diff --git a/tools/llvm-pdbdump/LLVMBuild.txt b/tools/llvm-pdbutil/LLVMBuild.txt similarity index 88% rename from tools/llvm-pdbdump/LLVMBuild.txt rename to tools/llvm-pdbutil/LLVMBuild.txt index 4043e13ceae..adbe4993e3f 100644 --- a/tools/llvm-pdbdump/LLVMBuild.txt +++ b/tools/llvm-pdbutil/LLVMBuild.txt @@ -1,4 +1,4 @@ -;===- ./tools/llvm-pdbdump/LLVMBuild.txt -----------------------*- Conf -*--===; +;===- ./tools/llvm-pdbutil/LLVMBuild.txt -----------------------*- Conf -*--===; ; ; The LLVM Compiler Infrastructure ; @@ -17,7 +17,7 @@ [component_0] type = Tool -name = llvm-pdbdump +name = llvm-pdbutil parent = Tools required_libraries = DebugInfoMSF DebugInfoPDB diff --git a/tools/llvm-pdbdump/LLVMOutputStyle.cpp b/tools/llvm-pdbutil/LLVMOutputStyle.cpp similarity index 99% rename from tools/llvm-pdbdump/LLVMOutputStyle.cpp rename to tools/llvm-pdbutil/LLVMOutputStyle.cpp index 2f108a4785c..8096ceda942 100644 --- a/tools/llvm-pdbdump/LLVMOutputStyle.cpp +++ b/tools/llvm-pdbutil/LLVMOutputStyle.cpp @@ -11,7 +11,7 @@ #include "CompactTypeDumpVisitor.h" #include "StreamUtil.h" -#include "llvm-pdbdump.h" +#include "llvm-pdbutil.h" #include "llvm/DebugInfo/CodeView/CVTypeVisitor.h" #include "llvm/DebugInfo/CodeView/DebugChecksumsSubsection.h" diff --git a/tools/llvm-pdbdump/LLVMOutputStyle.h b/tools/llvm-pdbutil/LLVMOutputStyle.h similarity index 100% rename from tools/llvm-pdbdump/LLVMOutputStyle.h rename to tools/llvm-pdbutil/LLVMOutputStyle.h diff --git a/tools/llvm-pdbdump/LinePrinter.cpp b/tools/llvm-pdbutil/LinePrinter.cpp similarity index 99% rename from tools/llvm-pdbdump/LinePrinter.cpp rename to tools/llvm-pdbutil/LinePrinter.cpp index 7fa524400ae..ef56b5fe8e6 100644 --- a/tools/llvm-pdbdump/LinePrinter.cpp +++ b/tools/llvm-pdbutil/LinePrinter.cpp @@ -9,7 +9,7 @@ #include "LinePrinter.h" -#include "llvm-pdbdump.h" +#include "llvm-pdbutil.h" #include "llvm/ADT/STLExtras.h" #include "llvm/DebugInfo/PDB/UDTLayout.h" diff --git a/tools/llvm-pdbdump/LinePrinter.h b/tools/llvm-pdbutil/LinePrinter.h similarity index 100% rename from tools/llvm-pdbdump/LinePrinter.h rename to tools/llvm-pdbutil/LinePrinter.h diff --git a/tools/llvm-pdbdump/OutputStyle.h b/tools/llvm-pdbutil/OutputStyle.h similarity index 100% rename from tools/llvm-pdbdump/OutputStyle.h rename to tools/llvm-pdbutil/OutputStyle.h diff --git a/tools/llvm-pdbdump/PdbYaml.cpp b/tools/llvm-pdbutil/PdbYaml.cpp similarity index 100% rename from tools/llvm-pdbdump/PdbYaml.cpp rename to tools/llvm-pdbutil/PdbYaml.cpp diff --git a/tools/llvm-pdbdump/PdbYaml.h b/tools/llvm-pdbutil/PdbYaml.h similarity index 100% rename from tools/llvm-pdbdump/PdbYaml.h rename to tools/llvm-pdbutil/PdbYaml.h diff --git a/tools/llvm-pdbdump/PrettyBuiltinDumper.cpp b/tools/llvm-pdbutil/PrettyBuiltinDumper.cpp similarity index 98% rename from tools/llvm-pdbdump/PrettyBuiltinDumper.cpp rename to tools/llvm-pdbutil/PrettyBuiltinDumper.cpp index 591d5e70cfd..fcda312e65e 100644 --- a/tools/llvm-pdbdump/PrettyBuiltinDumper.cpp +++ b/tools/llvm-pdbutil/PrettyBuiltinDumper.cpp @@ -9,7 +9,7 @@ #include "PrettyBuiltinDumper.h" #include "LinePrinter.h" -#include "llvm-pdbdump.h" +#include "llvm-pdbutil.h" #include "llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h" diff --git a/tools/llvm-pdbdump/PrettyBuiltinDumper.h b/tools/llvm-pdbutil/PrettyBuiltinDumper.h similarity index 100% rename from tools/llvm-pdbdump/PrettyBuiltinDumper.h rename to tools/llvm-pdbutil/PrettyBuiltinDumper.h diff --git a/tools/llvm-pdbdump/PrettyClassDefinitionDumper.cpp b/tools/llvm-pdbutil/PrettyClassDefinitionDumper.cpp similarity index 99% rename from tools/llvm-pdbdump/PrettyClassDefinitionDumper.cpp rename to tools/llvm-pdbutil/PrettyClassDefinitionDumper.cpp index 90f7772001d..651cb8b7649 100644 --- a/tools/llvm-pdbdump/PrettyClassDefinitionDumper.cpp +++ b/tools/llvm-pdbutil/PrettyClassDefinitionDumper.cpp @@ -11,7 +11,7 @@ #include "LinePrinter.h" #include "PrettyClassLayoutGraphicalDumper.h" -#include "llvm-pdbdump.h" +#include "llvm-pdbutil.h" #include "llvm/ADT/APFloat.h" #include "llvm/ADT/SmallString.h" diff --git a/tools/llvm-pdbdump/PrettyClassDefinitionDumper.h b/tools/llvm-pdbutil/PrettyClassDefinitionDumper.h similarity index 100% rename from tools/llvm-pdbdump/PrettyClassDefinitionDumper.h rename to tools/llvm-pdbutil/PrettyClassDefinitionDumper.h diff --git a/tools/llvm-pdbdump/PrettyClassLayoutGraphicalDumper.cpp b/tools/llvm-pdbutil/PrettyClassLayoutGraphicalDumper.cpp similarity index 99% rename from tools/llvm-pdbdump/PrettyClassLayoutGraphicalDumper.cpp rename to tools/llvm-pdbutil/PrettyClassLayoutGraphicalDumper.cpp index d1147267962..54e33683f55 100644 --- a/tools/llvm-pdbdump/PrettyClassLayoutGraphicalDumper.cpp +++ b/tools/llvm-pdbutil/PrettyClassLayoutGraphicalDumper.cpp @@ -16,7 +16,7 @@ #include "PrettyTypedefDumper.h" #include "PrettyVariableDumper.h" #include "PrettyVariableDumper.h" -#include "llvm-pdbdump.h" +#include "llvm-pdbutil.h" #include "llvm/DebugInfo/PDB/PDBSymbolData.h" #include "llvm/DebugInfo/PDB/PDBSymbolTypeBaseClass.h" diff --git a/tools/llvm-pdbdump/PrettyClassLayoutGraphicalDumper.h b/tools/llvm-pdbutil/PrettyClassLayoutGraphicalDumper.h similarity index 100% rename from tools/llvm-pdbdump/PrettyClassLayoutGraphicalDumper.h rename to tools/llvm-pdbutil/PrettyClassLayoutGraphicalDumper.h diff --git a/tools/llvm-pdbdump/PrettyCompilandDumper.cpp b/tools/llvm-pdbutil/PrettyCompilandDumper.cpp similarity index 98% rename from tools/llvm-pdbdump/PrettyCompilandDumper.cpp rename to tools/llvm-pdbutil/PrettyCompilandDumper.cpp index 9cf7bf82a16..65e8badbc99 100644 --- a/tools/llvm-pdbdump/PrettyCompilandDumper.cpp +++ b/tools/llvm-pdbutil/PrettyCompilandDumper.cpp @@ -1,4 +1,4 @@ -//===- PrettyCompilandDumper.cpp - llvm-pdbdump compiland dumper -*- C++ *-===// +//===- PrettyCompilandDumper.cpp - llvm-pdbutil compiland dumper -*- C++ *-===// // // The LLVM Compiler Infrastructure // @@ -11,7 +11,7 @@ #include "LinePrinter.h" #include "PrettyFunctionDumper.h" -#include "llvm-pdbdump.h" +#include "llvm-pdbutil.h" #include "llvm/DebugInfo/PDB/IPDBEnumChildren.h" #include "llvm/DebugInfo/PDB/IPDBLineNumber.h" diff --git a/tools/llvm-pdbdump/PrettyCompilandDumper.h b/tools/llvm-pdbutil/PrettyCompilandDumper.h similarity index 95% rename from tools/llvm-pdbdump/PrettyCompilandDumper.h rename to tools/llvm-pdbutil/PrettyCompilandDumper.h index 2127e7d1f52..cae196e9d13 100644 --- a/tools/llvm-pdbdump/PrettyCompilandDumper.h +++ b/tools/llvm-pdbutil/PrettyCompilandDumper.h @@ -1,4 +1,4 @@ -//===- PrettyCompilandDumper.h - llvm-pdbdump compiland dumper -*- C++ --*-===// +//===- PrettyCompilandDumper.h - llvm-pdbutil compiland dumper -*- C++ --*-===// // // The LLVM Compiler Infrastructure // diff --git a/tools/llvm-pdbdump/PrettyEnumDumper.cpp b/tools/llvm-pdbutil/PrettyEnumDumper.cpp similarity index 98% rename from tools/llvm-pdbdump/PrettyEnumDumper.cpp rename to tools/llvm-pdbutil/PrettyEnumDumper.cpp index 965ca1b9f98..7aff5b93d98 100644 --- a/tools/llvm-pdbdump/PrettyEnumDumper.cpp +++ b/tools/llvm-pdbutil/PrettyEnumDumper.cpp @@ -11,7 +11,7 @@ #include "LinePrinter.h" #include "PrettyBuiltinDumper.h" -#include "llvm-pdbdump.h" +#include "llvm-pdbutil.h" #include "llvm/DebugInfo/PDB/PDBSymbolData.h" #include "llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h" diff --git a/tools/llvm-pdbdump/PrettyEnumDumper.h b/tools/llvm-pdbutil/PrettyEnumDumper.h similarity index 100% rename from tools/llvm-pdbdump/PrettyEnumDumper.h rename to tools/llvm-pdbutil/PrettyEnumDumper.h diff --git a/tools/llvm-pdbdump/PrettyExternalSymbolDumper.cpp b/tools/llvm-pdbutil/PrettyExternalSymbolDumper.cpp similarity index 100% rename from tools/llvm-pdbdump/PrettyExternalSymbolDumper.cpp rename to tools/llvm-pdbutil/PrettyExternalSymbolDumper.cpp diff --git a/tools/llvm-pdbdump/PrettyExternalSymbolDumper.h b/tools/llvm-pdbutil/PrettyExternalSymbolDumper.h similarity index 100% rename from tools/llvm-pdbdump/PrettyExternalSymbolDumper.h rename to tools/llvm-pdbutil/PrettyExternalSymbolDumper.h diff --git a/tools/llvm-pdbdump/PrettyFunctionDumper.cpp b/tools/llvm-pdbutil/PrettyFunctionDumper.cpp similarity index 99% rename from tools/llvm-pdbdump/PrettyFunctionDumper.cpp rename to tools/llvm-pdbutil/PrettyFunctionDumper.cpp index 8b2043989b8..06d72410359 100644 --- a/tools/llvm-pdbdump/PrettyFunctionDumper.cpp +++ b/tools/llvm-pdbutil/PrettyFunctionDumper.cpp @@ -10,7 +10,7 @@ #include "PrettyFunctionDumper.h" #include "LinePrinter.h" #include "PrettyBuiltinDumper.h" -#include "llvm-pdbdump.h" +#include "llvm-pdbutil.h" #include "llvm/DebugInfo/PDB/IPDBSession.h" #include "llvm/DebugInfo/PDB/PDBExtras.h" diff --git a/tools/llvm-pdbdump/PrettyFunctionDumper.h b/tools/llvm-pdbutil/PrettyFunctionDumper.h similarity index 100% rename from tools/llvm-pdbdump/PrettyFunctionDumper.h rename to tools/llvm-pdbutil/PrettyFunctionDumper.h diff --git a/tools/llvm-pdbdump/PrettyTypeDumper.cpp b/tools/llvm-pdbutil/PrettyTypeDumper.cpp similarity index 99% rename from tools/llvm-pdbdump/PrettyTypeDumper.cpp rename to tools/llvm-pdbutil/PrettyTypeDumper.cpp index bbbb429f4f3..0f6086395ad 100644 --- a/tools/llvm-pdbdump/PrettyTypeDumper.cpp +++ b/tools/llvm-pdbutil/PrettyTypeDumper.cpp @@ -14,7 +14,7 @@ #include "PrettyClassDefinitionDumper.h" #include "PrettyEnumDumper.h" #include "PrettyTypedefDumper.h" -#include "llvm-pdbdump.h" +#include "llvm-pdbutil.h" #include "llvm/DebugInfo/PDB/IPDBSession.h" #include "llvm/DebugInfo/PDB/PDBSymbolExe.h" diff --git a/tools/llvm-pdbdump/PrettyTypeDumper.h b/tools/llvm-pdbutil/PrettyTypeDumper.h similarity index 100% rename from tools/llvm-pdbdump/PrettyTypeDumper.h rename to tools/llvm-pdbutil/PrettyTypeDumper.h diff --git a/tools/llvm-pdbdump/PrettyTypedefDumper.cpp b/tools/llvm-pdbutil/PrettyTypedefDumper.cpp similarity index 99% rename from tools/llvm-pdbdump/PrettyTypedefDumper.cpp rename to tools/llvm-pdbutil/PrettyTypedefDumper.cpp index 2d8e915d760..2266e6ea2be 100644 --- a/tools/llvm-pdbdump/PrettyTypedefDumper.cpp +++ b/tools/llvm-pdbutil/PrettyTypedefDumper.cpp @@ -12,7 +12,7 @@ #include "LinePrinter.h" #include "PrettyBuiltinDumper.h" #include "PrettyFunctionDumper.h" -#include "llvm-pdbdump.h" +#include "llvm-pdbutil.h" #include "llvm/DebugInfo/PDB/IPDBSession.h" #include "llvm/DebugInfo/PDB/PDBExtras.h" diff --git a/tools/llvm-pdbdump/PrettyTypedefDumper.h b/tools/llvm-pdbutil/PrettyTypedefDumper.h similarity index 94% rename from tools/llvm-pdbdump/PrettyTypedefDumper.h rename to tools/llvm-pdbutil/PrettyTypedefDumper.h index 34c13960130..133bbfb7db0 100644 --- a/tools/llvm-pdbdump/PrettyTypedefDumper.h +++ b/tools/llvm-pdbutil/PrettyTypedefDumper.h @@ -1,4 +1,4 @@ -//===- PrettyTypedefDumper.h - llvm-pdbdump typedef dumper ---*- C++ ----*-===// +//===- PrettyTypedefDumper.h - llvm-pdbutil typedef dumper ---*- C++ ----*-===// // // The LLVM Compiler Infrastructure // diff --git a/tools/llvm-pdbdump/PrettyVariableDumper.cpp b/tools/llvm-pdbutil/PrettyVariableDumper.cpp similarity index 99% rename from tools/llvm-pdbdump/PrettyVariableDumper.cpp rename to tools/llvm-pdbutil/PrettyVariableDumper.cpp index 70925f4b03d..4884fc8ee5a 100644 --- a/tools/llvm-pdbdump/PrettyVariableDumper.cpp +++ b/tools/llvm-pdbutil/PrettyVariableDumper.cpp @@ -12,7 +12,7 @@ #include "LinePrinter.h" #include "PrettyBuiltinDumper.h" #include "PrettyFunctionDumper.h" -#include "llvm-pdbdump.h" +#include "llvm-pdbutil.h" #include "llvm/DebugInfo/PDB/IPDBSession.h" #include "llvm/DebugInfo/PDB/PDBSymbolData.h" diff --git a/tools/llvm-pdbdump/PrettyVariableDumper.h b/tools/llvm-pdbutil/PrettyVariableDumper.h similarity index 100% rename from tools/llvm-pdbdump/PrettyVariableDumper.h rename to tools/llvm-pdbutil/PrettyVariableDumper.h diff --git a/tools/llvm-pdbdump/StreamUtil.cpp b/tools/llvm-pdbutil/StreamUtil.cpp similarity index 100% rename from tools/llvm-pdbdump/StreamUtil.cpp rename to tools/llvm-pdbutil/StreamUtil.cpp diff --git a/tools/llvm-pdbdump/StreamUtil.h b/tools/llvm-pdbutil/StreamUtil.h similarity index 100% rename from tools/llvm-pdbdump/StreamUtil.h rename to tools/llvm-pdbutil/StreamUtil.h diff --git a/tools/llvm-pdbdump/YAMLOutputStyle.cpp b/tools/llvm-pdbutil/YAMLOutputStyle.cpp similarity index 99% rename from tools/llvm-pdbdump/YAMLOutputStyle.cpp rename to tools/llvm-pdbutil/YAMLOutputStyle.cpp index 56175856097..58c538d968c 100644 --- a/tools/llvm-pdbdump/YAMLOutputStyle.cpp +++ b/tools/llvm-pdbutil/YAMLOutputStyle.cpp @@ -10,7 +10,7 @@ #include "YAMLOutputStyle.h" #include "PdbYaml.h" -#include "llvm-pdbdump.h" +#include "llvm-pdbutil.h" #include "llvm/DebugInfo/CodeView/DebugChecksumsSubsection.h" #include "llvm/DebugInfo/CodeView/DebugInlineeLinesSubsection.h" diff --git a/tools/llvm-pdbdump/YAMLOutputStyle.h b/tools/llvm-pdbutil/YAMLOutputStyle.h similarity index 100% rename from tools/llvm-pdbdump/YAMLOutputStyle.h rename to tools/llvm-pdbutil/YAMLOutputStyle.h diff --git a/tools/llvm-pdbdump/fuzzer/CMakeLists.txt b/tools/llvm-pdbutil/fuzzer/CMakeLists.txt similarity index 53% rename from tools/llvm-pdbdump/fuzzer/CMakeLists.txt rename to tools/llvm-pdbutil/fuzzer/CMakeLists.txt index cf5a0f70aab..6af00476577 100644 --- a/tools/llvm-pdbdump/fuzzer/CMakeLists.txt +++ b/tools/llvm-pdbutil/fuzzer/CMakeLists.txt @@ -5,11 +5,11 @@ set(LLVM_LINK_COMPONENTS Support ) -add_llvm_executable(llvm-pdbdump-fuzzer +add_llvm_executable(llvm-pdbutil-fuzzer EXCLUDE_FROM_ALL - llvm-pdbdump-fuzzer.cpp + llvm-pdbutil-fuzzer.cpp ) -target_link_libraries(llvm-pdbdump-fuzzer +target_link_libraries(llvm-pdbutil-fuzzer LLVMFuzzer ) diff --git a/tools/llvm-pdbdump/fuzzer/llvm-pdbdump-fuzzer.cpp b/tools/llvm-pdbutil/fuzzer/llvm-pdbutil-fuzzer.cpp similarity index 96% rename from tools/llvm-pdbdump/fuzzer/llvm-pdbdump-fuzzer.cpp rename to tools/llvm-pdbutil/fuzzer/llvm-pdbutil-fuzzer.cpp index 5f09416a9ff..4edb53e261f 100644 --- a/tools/llvm-pdbdump/fuzzer/llvm-pdbdump-fuzzer.cpp +++ b/tools/llvm-pdbutil/fuzzer/llvm-pdbutil-fuzzer.cpp @@ -1,4 +1,4 @@ -//===-- llvm-pdbdump-fuzzer.cpp - Fuzz the llvm-pdbdump tool --------------===// +//===-- llvm-pdbutil-fuzzer.cpp - Fuzz the llvm-pdbutil tool --------------===// // // The LLVM Compiler Infrastructure // @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// /// /// \file -/// \brief This file implements a function that runs llvm-pdbdump +/// \brief This file implements a function that runs llvm-pdbutil /// on a single input. This function is then linked into the Fuzzer library. /// //===----------------------------------------------------------------------===// diff --git a/tools/llvm-pdbdump/llvm-pdbdump.cpp b/tools/llvm-pdbutil/llvm-pdbutil.cpp similarity index 99% rename from tools/llvm-pdbdump/llvm-pdbdump.cpp rename to tools/llvm-pdbutil/llvm-pdbutil.cpp index c6e2b613f4d..fa2a5bdd9d3 100644 --- a/tools/llvm-pdbdump/llvm-pdbdump.cpp +++ b/tools/llvm-pdbutil/llvm-pdbutil.cpp @@ -1,4 +1,4 @@ -//===- llvm-pdbdump.cpp - Dump debug info from a PDB file -------*- C++ -*-===// +//===- llvm-pdbutil.cpp - Dump debug info from a PDB file -------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm-pdbdump.h" +#include "llvm-pdbutil.h" #include "Analyze.h" #include "Diff.h" @@ -867,7 +867,7 @@ int main(int argc_, const char *argv_[]) { sys::PrintStackTraceOnErrorSignal(argv_[0]); PrettyStackTraceProgram X(argc_, argv_); - ExitOnErr.setBanner("llvm-pdbdump: "); + ExitOnErr.setBanner("llvm-pdbutil: "); SmallVector argv; SpecificBumpPtrAllocator ArgAllocator; diff --git a/tools/llvm-pdbdump/llvm-pdbdump.h b/tools/llvm-pdbutil/llvm-pdbutil.h similarity index 98% rename from tools/llvm-pdbdump/llvm-pdbdump.h rename to tools/llvm-pdbutil/llvm-pdbutil.h index 2858ac35a9d..4f3665237c7 100644 --- a/tools/llvm-pdbdump/llvm-pdbdump.h +++ b/tools/llvm-pdbutil/llvm-pdbutil.h @@ -1,4 +1,4 @@ -//===- llvm-pdbdump.h ----------------------------------------- *- C++ --*-===// +//===- llvm-pdbutil.h ----------------------------------------- *- C++ --*-===// // // The LLVM Compiler Infrastructure // -- 2.40.0