diff options
229 files changed, 383 insertions, 367 deletions
diff --git a/llvm/include/llvm/BinaryFormat/Dwarf.def b/llvm/include/llvm/BinaryFormat/Dwarf.def index 3df3300de46..88dec74f9c2 100644 --- a/llvm/include/llvm/BinaryFormat/Dwarf.def +++ b/llvm/include/llvm/BinaryFormat/Dwarf.def @@ -20,7 +20,7 @@ defined HANDLE_DW_LNE || defined HANDLE_DW_LNCT || \ defined HANDLE_DW_MACRO || defined HANDLE_DW_RLE || \ defined HANDLE_DW_CFA || defined HANDLE_DW_APPLE_PROPERTY || \ - defined HANDLE_DW_UT) + defined HANDLE_DW_UT || defined HANDLE_DWARF_SECTION) #error "Missing macro definition of HANDLE_DW*" #endif @@ -92,6 +92,10 @@ #define HANDLE_DW_UT(ID, NAME) #endif +#ifndef HANDLE_DWARF_SECTION +#define HANDLE_DWARF_SECTION(ENUM_NAME, ELF_NAME, CMDLINE_NAME) +#endif + HANDLE_DW_TAG(0x0000, null, 2, DWARF) HANDLE_DW_TAG(0x0001, array_type, 2, DWARF) HANDLE_DW_TAG(0x0002, class_type, 2, DWARF) @@ -819,6 +823,42 @@ HANDLE_DW_UT(0x04, skeleton) HANDLE_DW_UT(0x05, split_compile) HANDLE_DW_UT(0x06, split_type) +// DWARF section types. (enum name, ELF name, cmdline name) +// Note that these IDs don't mean anything. +// TODO: Add Mach-O and COFF names. +// Official DWARF sections. +HANDLE_DWARF_SECTION(DebugAbbrev, ".debug_abbrev", "debug-abbrev") +HANDLE_DWARF_SECTION(DebugAbbrevDwo, ".debug_abbrev.dwo", "debug-abbrev-dwo") +HANDLE_DWARF_SECTION(DebugAranges, ".debug_aranges", "debug-aranges") +HANDLE_DWARF_SECTION(DebugInfo, ".debug_info", "debug-info") +HANDLE_DWARF_SECTION(DebugInfoDwo, ".debug_info.dwo", "debug-info-dwo") +HANDLE_DWARF_SECTION(DebugTypes, ".debug_types", "debug-types") +HANDLE_DWARF_SECTION(DebugTypesDwo, ".debug_types.dwo", "debug-types-dwo") +HANDLE_DWARF_SECTION(DebugLine, ".debug_line", "debug-line") +HANDLE_DWARF_SECTION(DebugLineDwo, ".debug_line.dwo", "debug-line-dwo") +HANDLE_DWARF_SECTION(DebugLoc, ".debug_loc", "debug-loc") +HANDLE_DWARF_SECTION(DebugLocDwo, ".debug_loc.dwo", "debug-loc-dwo") +HANDLE_DWARF_SECTION(DebugFrames, ".debug_frames", "debug-frames") +HANDLE_DWARF_SECTION(DebugMacro, ".debug_macro", "debug-macro") +HANDLE_DWARF_SECTION(DebugRanges, ".debug_ranges", "debug-ranges") +HANDLE_DWARF_SECTION(DebugPubnames, ".debug_pubnames", "debug-pubnames") +HANDLE_DWARF_SECTION(DebugPubtypes, ".debug_pubtypes", "debug-pubtypes") +HANDLE_DWARF_SECTION(DebugGnuPubnames, ".debug_gnu_pubnames", "debug-gnu-pubnames") +HANDLE_DWARF_SECTION(DebugGnuPubtypes, ".debug_gnu_pubtypes", "debug-gnu-pubtypes") +HANDLE_DWARF_SECTION(DebugStr, ".debug_str", "debug-str") +HANDLE_DWARF_SECTION(DebugStrOffsets, ".debug_str_offsets", "debug-str-offsets") +HANDLE_DWARF_SECTION(DebugStrDwo, ".debug_str.dwo", "debug-str-dwo") +HANDLE_DWARF_SECTION(DebugStrOffsetsDwo, ".debug_str_offsets.dwo", "debug-str-offsets-dwo") +HANDLE_DWARF_SECTION(DebugCUIndex, ".debug_cu_index", "debug-cu-index") +HANDLE_DWARF_SECTION(DebugTUIndex, ".debug_tu_index", "debug-tu-index") +// Vendor extensions. +HANDLE_DWARF_SECTION(AppleNames, ".apple_names", "apple-names") +HANDLE_DWARF_SECTION(AppleTypes, ".apple_types", "apple-types") +HANDLE_DWARF_SECTION(AppleNamespaces, ".apple_namespaces", "apple-namespaces") +HANDLE_DWARF_SECTION(AppleObjC, ".apple_objc", "apple-objc") +HANDLE_DWARF_SECTION(GdbIndex, ".gdb_index", "gdb-index") + + #undef HANDLE_DW_TAG #undef HANDLE_DW_AT #undef HANDLE_DW_FORM @@ -836,3 +876,4 @@ HANDLE_DW_UT(0x06, split_type) #undef HANDLE_DW_CFA #undef HANDLE_DW_APPLE_PROPERTY #undef HANDLE_DW_UT +#undef HANDLE_DWARF_SECTION diff --git a/llvm/include/llvm/DebugInfo/DIContext.h b/llvm/include/llvm/DebugInfo/DIContext.h index 936813dc6ab..d6657b4d8d4 100644 --- a/llvm/include/llvm/DebugInfo/DIContext.h +++ b/llvm/include/llvm/DebugInfo/DIContext.h @@ -112,45 +112,31 @@ struct DILineInfoSpecifier { : FLIKind(FLIKind), FNKind(FNKind) {} }; +namespace { +/// This is just a helper to programmatically construct DIDumpType. +enum DIDumpTypeCounter { + DIDT_ID_Null = 0, +#define HANDLE_DWARF_SECTION(ENUM_NAME, ELF_NAME, CMDLINE_NAME) \ + DIDT_ID##ENUM_NAME, +#include "llvm/BinaryFormat/Dwarf.def" +#undef HANDLE_DWARF_SECTION +}; +} + /// Selects which debug sections get dumped. -enum DIDumpType { +enum DIDumpType : uint64_t { DIDT_Null, - DIDT_All, - DIDT_Abbrev, - DIDT_AbbrevDwo, - DIDT_Aranges, - DIDT_Frames, - DIDT_Info, - DIDT_InfoDwo, - DIDT_Types, - DIDT_TypesDwo, - DIDT_Line, - DIDT_LineDwo, - DIDT_Loc, - DIDT_LocDwo, - DIDT_Macro, - DIDT_Ranges, - DIDT_Pubnames, - DIDT_Pubtypes, - DIDT_GnuPubnames, - DIDT_GnuPubtypes, - DIDT_Str, - DIDT_StrOffsets, - DIDT_StrDwo, - DIDT_StrOffsetsDwo, - DIDT_AppleNames, - DIDT_AppleTypes, - DIDT_AppleNamespaces, - DIDT_AppleObjC, - DIDT_CUIndex, - DIDT_GdbIndex, - DIDT_TUIndex, + DIDT_All = ~0ULL, +#define HANDLE_DWARF_SECTION(ENUM_NAME, ELF_NAME, CMDLINE_NAME) \ + DIDT_##ENUM_NAME = 1 << DIDT_ID##ENUM_NAME, +#include "llvm/BinaryFormat/Dwarf.def" +#undef HANDLE_DWARF_SECTION }; /// Container for dump options that control which debug information will be /// dumped. struct DIDumpOptions { - DIDumpType DumpType = DIDT_All; + uint64_t DumpType = DIDT_All; bool DumpEH = false; bool SummarizeTypes = false; bool Brief = false; @@ -170,7 +156,7 @@ public: virtual void dump(raw_ostream &OS, DIDumpOptions DumpOpts) = 0; - virtual bool verify(raw_ostream &OS, DIDumpType DumpType = DIDT_All) { + virtual bool verify(raw_ostream &OS, uint64_t DumpType = DIDT_All) { // No verifier? Just say things went well. return true; } diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h index 9f5ce3e79f7..3e3d514cb57 100644 --- a/llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h +++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h @@ -123,7 +123,7 @@ public: void dump(raw_ostream &OS, DIDumpOptions DumpOpts) override; - bool verify(raw_ostream &OS, DIDumpType DumpType = DIDT_All) override; + bool verify(raw_ostream &OS, uint64_t DumpType = DIDT_All) override; using cu_iterator_range = DWARFUnitSection<DWARFCompileUnit>::iterator_range; using tu_iterator_range = DWARFUnitSection<DWARFTypeUnit>::iterator_range; diff --git a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp index 27d9db643bf..b1d8f139544 100644 --- a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp +++ b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp @@ -200,42 +200,42 @@ static void dumpStringOffsetsSection(raw_ostream &OS, StringRef SectionName, } void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) { - DIDumpType DumpType = DumpOpts.DumpType; + uint64_t DumpType = DumpOpts.DumpType; bool DumpEH = DumpOpts.DumpEH; bool SummarizeTypes = DumpOpts.SummarizeTypes; - if (DumpType == DIDT_All || DumpType == DIDT_Abbrev) { + if (DumpType & DIDT_DebugAbbrev) { OS << ".debug_abbrev contents:\n"; getDebugAbbrev()->dump(OS); } - if (DumpType == DIDT_All || DumpType == DIDT_AbbrevDwo) + if (DumpType & DIDT_DebugAbbrevDwo) if (const DWARFDebugAbbrev *D = getDebugAbbrevDWO()) { OS << "\n.debug_abbrev.dwo contents:\n"; D->dump(OS); } - if (DumpType == DIDT_All || DumpType == DIDT_Info) { + if (DumpType & DIDT_DebugInfo) { OS << "\n.debug_info contents:\n"; for (const auto &CU : compile_units()) CU->dump(OS, DumpOpts); } - if ((DumpType == DIDT_All || DumpType == DIDT_InfoDwo) && + if ((DumpType & DIDT_DebugInfoDwo) && getNumDWOCompileUnits()) { OS << "\n.debug_info.dwo contents:\n"; for (const auto &DWOCU : dwo_compile_units()) DWOCU->dump(OS, DumpOpts); } - if ((DumpType == DIDT_All || DumpType == DIDT_Types) && getNumTypeUnits()) { + if ((DumpType & DIDT_DebugTypes) && getNumTypeUnits()) { OS << "\n.debug_types contents:\n"; for (const auto &TUS : type_unit_sections()) for (const auto &TU : TUS) TU->dump(OS, SummarizeTypes); } - if ((DumpType == DIDT_All || DumpType == DIDT_TypesDwo) && + if ((DumpType & DIDT_DebugTypesDwo) && getNumDWOTypeUnits()) { OS << "\n.debug_types.dwo contents:\n"; for (const auto &DWOTUS : dwo_type_unit_sections()) @@ -243,17 +243,17 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) { DWOTU->dump(OS, SummarizeTypes); } - if (DumpType == DIDT_All || DumpType == DIDT_Loc) { + if (DumpType & DIDT_DebugLoc) { OS << "\n.debug_loc contents:\n"; getDebugLoc()->dump(OS, getRegisterInfo()); } - if (DumpType == DIDT_All || DumpType == DIDT_LocDwo) { + if (DumpType & DIDT_DebugLocDwo) { OS << "\n.debug_loc.dwo contents:\n"; getDebugLocDWO()->dump(OS, getRegisterInfo()); } - if (DumpType == DIDT_All || DumpType == DIDT_Frames) { + if (DumpType & DIDT_DebugFrames) { OS << "\n.debug_frame contents:\n"; getDebugFrame()->dump(OS); if (DumpEH) { @@ -262,13 +262,13 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) { } } - if (DumpType == DIDT_All || DumpType == DIDT_Macro) { + if (DumpType & DIDT_DebugMacro) { OS << "\n.debug_macinfo contents:\n"; getDebugMacro()->dump(OS); } uint32_t offset = 0; - if (DumpType == DIDT_All || DumpType == DIDT_Aranges) { + if (DumpType & DIDT_DebugAranges) { OS << "\n.debug_aranges contents:\n"; DataExtractor arangesData(DObj->getARangeSection(), isLittleEndian(), 0); DWARFDebugArangeSet set; @@ -277,7 +277,7 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) { } uint8_t savedAddressByteSize = 0; - if (DumpType == DIDT_All || DumpType == DIDT_Line) { + if (DumpType & DIDT_DebugLine) { OS << "\n.debug_line contents:\n"; for (const auto &CU : compile_units()) { savedAddressByteSize = CU->getAddressByteSize(); @@ -295,17 +295,17 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) { } } - if (DumpType == DIDT_All || DumpType == DIDT_CUIndex) { + if (DumpType & DIDT_DebugCUIndex) { OS << "\n.debug_cu_index contents:\n"; getCUIndex().dump(OS); } - if (DumpType == DIDT_All || DumpType == DIDT_TUIndex) { + if (DumpType & DIDT_DebugTUIndex) { OS << "\n.debug_tu_index contents:\n"; getTUIndex().dump(OS); } - if (DumpType == DIDT_All || DumpType == DIDT_LineDwo) { + if (DumpType & DIDT_DebugLineDwo) { OS << "\n.debug_line.dwo contents:\n"; unsigned stmtOffset = 0; DWARFDataExtractor lineData(*DObj, DObj->getLineDWOSection(), @@ -317,7 +317,7 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) { } } - if (DumpType == DIDT_All || DumpType == DIDT_Str) { + if (DumpType & DIDT_DebugStr) { OS << "\n.debug_str contents:\n"; DataExtractor strData(DObj->getStringSection(), isLittleEndian(), 0); offset = 0; @@ -328,7 +328,7 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) { } } - if ((DumpType == DIDT_All || DumpType == DIDT_StrDwo) && + if ((DumpType & DIDT_DebugStrDwo) && !DObj->getStringDWOSection().empty()) { OS << "\n.debug_str.dwo contents:\n"; DataExtractor strDWOData(DObj->getStringDWOSection(), isLittleEndian(), 0); @@ -340,7 +340,7 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) { } } - if (DumpType == DIDT_All || DumpType == DIDT_Ranges) { + if (DumpType & DIDT_DebugRanges) { OS << "\n.debug_ranges contents:\n"; // In fact, different compile units may have different address byte // sizes, but for simplicity we just use the address byte size of the last @@ -354,55 +354,55 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) { rangeList.dump(OS); } - if (DumpType == DIDT_All || DumpType == DIDT_Pubnames) + if (DumpType & DIDT_DebugPubnames) DWARFDebugPubTable(DObj->getPubNamesSection(), isLittleEndian(), false) .dump("debug_pubnames", OS); - if (DumpType == DIDT_All || DumpType == DIDT_Pubtypes) + if (DumpType & DIDT_DebugPubtypes) DWARFDebugPubTable(DObj->getPubTypesSection(), isLittleEndian(), false) .dump("debug_pubtypes", OS); - if (DumpType == DIDT_All || DumpType == DIDT_GnuPubnames) + if (DumpType & DIDT_DebugGnuPubnames) DWARFDebugPubTable(DObj->getGnuPubNamesSection(), isLittleEndian(), true /* GnuStyle */) .dump("debug_gnu_pubnames", OS); - if (DumpType == DIDT_All || DumpType == DIDT_GnuPubtypes) + if (DumpType & DIDT_DebugGnuPubtypes) DWARFDebugPubTable(DObj->getGnuPubTypesSection(), isLittleEndian(), true /* GnuStyle */) .dump("debug_gnu_pubtypes", OS); - if (DumpType == DIDT_All || DumpType == DIDT_StrOffsets) + if (DumpType & DIDT_DebugStrOffsets) dumpStringOffsetsSection( OS, "debug_str_offsets", *DObj, DObj->getStringOffsetSection(), DObj->getStringSection(), isLittleEndian(), getMaxVersion()); - if (DumpType == DIDT_All || DumpType == DIDT_StrOffsetsDwo) { + if (DumpType & DIDT_DebugStrOffsetsDwo) { dumpStringOffsetsSection( OS, "debug_str_offsets.dwo", *DObj, DObj->getStringOffsetDWOSection(), DObj->getStringDWOSection(), isLittleEndian(), getMaxVersion()); } - if ((DumpType == DIDT_All || DumpType == DIDT_GdbIndex) && + if ((DumpType & DIDT_GdbIndex) && !DObj->getGdbIndexSection().empty()) { OS << "\n.gnu_index contents:\n"; getGdbIndex().dump(OS); } - if (DumpType == DIDT_All || DumpType == DIDT_AppleNames) + if (DumpType & DIDT_AppleNames) dumpAccelSection(OS, "apple_names", *DObj, DObj->getAppleNamesSection(), DObj->getStringSection(), isLittleEndian()); - if (DumpType == DIDT_All || DumpType == DIDT_AppleTypes) + if (DumpType & DIDT_AppleTypes) dumpAccelSection(OS, "apple_types", *DObj, DObj->getAppleTypesSection(), DObj->getStringSection(), isLittleEndian()); - if (DumpType == DIDT_All || DumpType == DIDT_AppleNamespaces) + if (DumpType & DIDT_AppleNamespaces) dumpAccelSection(OS, "apple_namespaces", *DObj, DObj->getAppleNamespacesSection(), DObj->getStringSection(), isLittleEndian()); - if (DumpType == DIDT_All || DumpType == DIDT_AppleObjC) + if (DumpType & DIDT_AppleObjC) dumpAccelSection(OS, "apple_objc", *DObj, DObj->getAppleObjCSection(), DObj->getStringSection(), isLittleEndian()); } @@ -434,14 +434,14 @@ DWARFDie DWARFContext::getDIEForOffset(uint32_t Offset) { return DWARFDie(); } -bool DWARFContext::verify(raw_ostream &OS, DIDumpType DumpType) { +bool DWARFContext::verify(raw_ostream &OS, uint64_t DumpType) { bool Success = true; DWARFVerifier verifier(OS, *this); Success &= verifier.handleDebugAbbrev(); - if (DumpType == DIDT_All || DumpType == DIDT_Info) + if (DumpType & DIDT_DebugInfo) Success &= verifier.handleDebugInfo(); - if (DumpType == DIDT_All || DumpType == DIDT_Line) + if (DumpType & DIDT_DebugLine) Success &= verifier.handleDebugLine(); Success &= verifier.handleAccelTables(); return Success; diff --git a/llvm/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll b/llvm/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll index 2d7c0e13c58..85e31dc41c5 100644 --- a/llvm/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll +++ b/llvm/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll @@ -1,4 +1,4 @@ -; RUN: llc -arm-global-merge -global-merge-group-by-use=false -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -arm-global-merge -global-merge-group-by-use=false -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s source_filename = "test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll" target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:32:64-v128:32:128-a0:0:32-n32" diff --git a/llvm/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll b/llvm/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll index da681319fa3..5200c129d5f 100644 --- a/llvm/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll +++ b/llvm/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll @@ -1,4 +1,4 @@ -; RUN: llc -arm-global-merge -global-merge-group-by-use=false -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -arm-global-merge -global-merge-group-by-use=false -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; CHECK: DW_TAG_variable ; CHECK-NOT: DW_TAG diff --git a/llvm/test/CodeGen/ARM/debug-info-sreg2.ll b/llvm/test/CodeGen/ARM/debug-info-sreg2.ll index ec2bd04e185..34bc938fab5 100644 --- a/llvm/test/CodeGen/ARM/debug-info-sreg2.ll +++ b/llvm/test/CodeGen/ARM/debug-info-sreg2.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s - -filetype=obj | llvm-dwarfdump -debug-dump=loc - | FileCheck %s +; RUN: llc < %s - -filetype=obj | llvm-dwarfdump -debug-loc - | FileCheck %s ; Radar 9376013 target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:32-f32:32:32-f64:32:32-v64:32:64-v128:32:128-a0:0:32-n32" target triple = "thumbv7-apple-macosx10.6.7" diff --git a/llvm/test/CodeGen/BPF/dwarfdump.ll b/llvm/test/CodeGen/BPF/dwarfdump.ll index ad667c2f5b9..702cb28423f 100644 --- a/llvm/test/CodeGen/BPF/dwarfdump.ll +++ b/llvm/test/CodeGen/BPF/dwarfdump.ll @@ -1,7 +1,7 @@ ; RUN: llc -O2 -march=bpfel %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s ; RUN: llc -O2 -march=bpfeb %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s source_filename = "testprog.c" target datalayout = "e-m:e-p:64:64-i64:64-n32:64-S128" diff --git a/llvm/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll b/llvm/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll index 68edc1c3edb..5983c4a992e 100644 --- a/llvm/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll +++ b/llvm/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -filetype=obj | llvm-dwarfdump -debug-dump=info - | FileCheck %s -; RUN: llc < %s -filetype=obj -regalloc=basic | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-dwarfdump -debug-info - | FileCheck %s +; RUN: llc < %s -filetype=obj -regalloc=basic | llvm-dwarfdump -debug-info - | FileCheck %s target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" target triple = "x86_64-apple-darwin10.0.0" diff --git a/llvm/test/CodeGen/X86/dbg-line-0-no-discriminator.ll b/llvm/test/CodeGen/X86/dbg-line-0-no-discriminator.ll index e667a552de3..72fc0480fd4 100644 --- a/llvm/test/CodeGen/X86/dbg-line-0-no-discriminator.ll +++ b/llvm/test/CodeGen/X86/dbg-line-0-no-discriminator.ll @@ -1,5 +1,5 @@ ; RUN: llc -filetype=obj -use-unknown-locations=Enable -mtriple=x86_64-unknown-linux %s -o %t -; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s define void @_Z3bazv() !dbg !6 { call void @_Z3foov(), !dbg !9 diff --git a/llvm/test/CodeGen/X86/dwarf-comp-dir.ll b/llvm/test/CodeGen/X86/dwarf-comp-dir.ll index b744a70288e..8c4b8fdc360 100644 --- a/llvm/test/CodeGen/X86/dwarf-comp-dir.ll +++ b/llvm/test/CodeGen/X86/dwarf-comp-dir.ll @@ -1,5 +1,5 @@ ; RUN: llc %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/DebugInfo/AArch64/bitfields.ll b/llvm/test/DebugInfo/AArch64/bitfields.ll index bbae89674f4..08230fd7f37 100644 --- a/llvm/test/DebugInfo/AArch64/bitfields.ll +++ b/llvm/test/DebugInfo/AArch64/bitfields.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple aarch64_be-gnu-linux -O0 -filetype=obj -o %t_be.o %s -; RUN: llvm-dwarfdump -debug-dump=info %t_be.o | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t_be.o | FileCheck %s ; Produced at -O0 from: ; struct bitfield { diff --git a/llvm/test/DebugInfo/AMDGPU/code-pointer-size.ll b/llvm/test/DebugInfo/AMDGPU/code-pointer-size.ll index 9b2b0da945e..4e9d26bc0cb 100644 --- a/llvm/test/DebugInfo/AMDGPU/code-pointer-size.ll +++ b/llvm/test/DebugInfo/AMDGPU/code-pointer-size.ll @@ -1,4 +1,4 @@ -; RUN: llc -O0 -mtriple=amdgcn--amdhsa -mcpu=fiji -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -O0 -mtriple=amdgcn--amdhsa -mcpu=fiji -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; LLVM IR generated with the following command and OpenCL source: ; diff --git a/llvm/test/DebugInfo/AMDGPU/pointer-address-space.ll b/llvm/test/DebugInfo/AMDGPU/pointer-address-space.ll index a99d690935a..30d6024acc4 100644 --- a/llvm/test/DebugInfo/AMDGPU/pointer-address-space.ll +++ b/llvm/test/DebugInfo/AMDGPU/pointer-address-space.ll @@ -1,4 +1,4 @@ -; RUN: llc -O0 -mtriple=amdgcn--amdhsa -mcpu=fiji -verify-machineinstrs -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -O0 -mtriple=amdgcn--amdhsa -mcpu=fiji -verify-machineinstrs -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; LLVM IR generated with the following command and OpenCL source: ; diff --git a/llvm/test/DebugInfo/AMDGPU/variable-locations.ll b/llvm/test/DebugInfo/AMDGPU/variable-locations.ll index 359a0495dcd..9ec5eb4ea12 100644 --- a/llvm/test/DebugInfo/AMDGPU/variable-locations.ll +++ b/llvm/test/DebugInfo/AMDGPU/variable-locations.ll @@ -1,4 +1,4 @@ -; RUN: llc -O0 -mtriple=amdgcn-amd-amdhsa -mcpu=fiji -verify-machineinstrs -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -O0 -mtriple=amdgcn-amd-amdhsa -mcpu=fiji -verify-machineinstrs -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; LLVM IR generated with the following command and OpenCL source: ; diff --git a/llvm/test/DebugInfo/ARM/PR16736.ll b/llvm/test/DebugInfo/ARM/PR16736.ll index cb668c90fef..3369a90e1d9 100644 --- a/llvm/test/DebugInfo/ARM/PR16736.ll +++ b/llvm/test/DebugInfo/ARM/PR16736.ll @@ -1,6 +1,6 @@ ; RUN: llc -filetype=asm < %s | FileCheck %s ; RUN: llc -filetype=obj < %s \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck %s --check-prefix=DWARF +; RUN: | llvm-dwarfdump -debug-info - | FileCheck %s --check-prefix=DWARF ; ; CHECK: @DEBUG_VALUE: h:x <- [DW_OP_plus_uconst {{.*}}] [%R{{.*}}+0] ; DWARF: DW_TAG_formal_parameter diff --git a/llvm/test/DebugInfo/ARM/PR26163.ll b/llvm/test/DebugInfo/ARM/PR26163.ll index fd84c9b0229..dfb31c204b3 100644 --- a/llvm/test/DebugInfo/ARM/PR26163.ll +++ b/llvm/test/DebugInfo/ARM/PR26163.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj -o - < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -filetype=obj -o - < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; ; Checks that we're creating two ranges, one that terminates immediately ; and one that spans the rest of the function. This isn't necessarily the diff --git a/llvm/test/DebugInfo/ARM/big-endian-bitfield.ll b/llvm/test/DebugInfo/ARM/big-endian-bitfield.ll index 43409a736dd..00c290299ba 100644 --- a/llvm/test/DebugInfo/ARM/big-endian-bitfield.ll +++ b/llvm/test/DebugInfo/ARM/big-endian-bitfield.ll @@ -1,5 +1,5 @@ ; RUN: llc -O0 -filetype=obj -mtriple=armeb-none-freebsd -debugger-tune=lldb %s -o - \ -; RUN: | llvm-dwarfdump --debug-dump=info - | FileCheck %s +; RUN: | llvm-dwarfdump --debug-info - | FileCheck %s ; Generated from: ; struct S { ; int j:5; diff --git a/llvm/test/DebugInfo/ARM/bitfield.ll b/llvm/test/DebugInfo/ARM/bitfield.ll index abfda62f52e..24a6e6ab835 100644 --- a/llvm/test/DebugInfo/ARM/bitfield.ll +++ b/llvm/test/DebugInfo/ARM/bitfield.ll @@ -1,5 +1,5 @@ ; RUN: %llc_dwarf -O0 -filetype=obj -o %t.o %s -; RUN: llvm-dwarfdump -debug-dump=info %t.o | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t.o | FileCheck %s ; REQUIRES: object-emission ; ; Generated from: diff --git a/llvm/test/DebugInfo/ARM/float-args.ll b/llvm/test/DebugInfo/ARM/float-args.ll index 28a14c40e4c..d459c39ed4b 100644 --- a/llvm/test/DebugInfo/ARM/float-args.ll +++ b/llvm/test/DebugInfo/ARM/float-args.ll @@ -1,5 +1,5 @@ -; RUN: %llc_dwarf -filetype=obj -mattr=+vfp2 -float-abi=hard < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s -; RUN: %llc_dwarf -filetype=obj -mattr=-vfp2 -float-abi=soft < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj -mattr=+vfp2 -float-abi=hard < %s | llvm-dwarfdump -debug-info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj -mattr=-vfp2 -float-abi=soft < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; REQUIRES: object-emission ; Generated by clang -O1 -g from the following C source: diff --git a/llvm/test/DebugInfo/ARM/s-super-register.ll b/llvm/test/DebugInfo/ARM/s-super-register.ll index 30c8bda1de9..e458dc9a205 100644 --- a/llvm/test/DebugInfo/ARM/s-super-register.ll +++ b/llvm/test/DebugInfo/ARM/s-super-register.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s - -filetype=obj | llvm-dwarfdump -debug-dump=loc - | FileCheck %s +; RUN: llc < %s - -filetype=obj | llvm-dwarfdump -debug-loc - | FileCheck %s target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:32-f32:32:32-f64:32:32-v64:32:64-v128:32:128-a0:0:32-n32" target triple = "thumbv7-apple-macosx10.6.7" diff --git a/llvm/test/DebugInfo/ARM/split-complex.ll b/llvm/test/DebugInfo/ARM/split-complex.ll index 2e65f2ff84f..c738bfa6ce6 100644 --- a/llvm/test/DebugInfo/ARM/split-complex.ll +++ b/llvm/test/DebugInfo/ARM/split-complex.ll @@ -1,5 +1,5 @@ ; RUN: %llc_dwarf -O0 -filetype=obj -o %t.o %s -; RUN: llvm-dwarfdump -debug-dump=info %t.o | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t.o | FileCheck %s ; REQUIRES: object-emission target datalayout = "e-m:o-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" target triple = "thumbv7-apple-unknown-macho" diff --git a/llvm/test/DebugInfo/Generic/2010-04-06-NestedFnDbgInfo.ll b/llvm/test/DebugInfo/Generic/2010-04-06-NestedFnDbgInfo.ll index 371cbdb40e6..485c00cc0ea 100644 --- a/llvm/test/DebugInfo/Generic/2010-04-06-NestedFnDbgInfo.ll +++ b/llvm/test/DebugInfo/Generic/2010-04-06-NestedFnDbgInfo.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj -o - < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O0 -filetype=obj -o - < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; Radar 7833483 ; Do not emit a separate out-of-line definition DIE for the function-local 'foo' ; function (member of the function local 'A' type) diff --git a/llvm/test/DebugInfo/Generic/2010-05-10-MultipleCU.ll b/llvm/test/DebugInfo/Generic/2010-05-10-MultipleCU.ll index 686212fe49c..f3ae107644e 100644 --- a/llvm/test/DebugInfo/Generic/2010-05-10-MultipleCU.ll +++ b/llvm/test/DebugInfo/Generic/2010-05-10-MultipleCU.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; Check that two compile units are generated diff --git a/llvm/test/DebugInfo/Generic/PR20038.ll b/llvm/test/DebugInfo/Generic/PR20038.ll index 8bf3b3d99bc..8e0d71a0d75 100644 --- a/llvm/test/DebugInfo/Generic/PR20038.ll +++ b/llvm/test/DebugInfo/Generic/PR20038.ll @@ -3,7 +3,7 @@ ; For some reason, the output when targetting sparc is not quite as expected. ; XFAIL: sparc -; RUN: %llc_dwarf -O0 -filetype=obj -dwarf-linkage-names=All < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O0 -filetype=obj -dwarf-linkage-names=All < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; IR generated from clang -O0 with: ; struct C { diff --git a/llvm/test/DebugInfo/Generic/accel-table-hash-collisions.ll b/llvm/test/DebugInfo/Generic/accel-table-hash-collisions.ll index b85c511c28d..fb32a0d0d71 100644 --- a/llvm/test/DebugInfo/Generic/accel-table-hash-collisions.ll +++ b/llvm/test/DebugInfo/Generic/accel-table-hash-collisions.ll @@ -1,5 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -dwarf-accel-tables=Enable -filetype=obj -o - < %s | llvm-dwarfdump -debug-dump=apple_names - | FileCheck %s +; RUN: %llc_dwarf -dwarf-accel-tables=Enable -filetype=obj -o - < %s \ +; RUN: | llvm-dwarfdump -apple-names - | FileCheck %s ; Generated from the following C code using ; clang -S -emit-llvm hash-collision.c diff --git a/llvm/test/DebugInfo/Generic/constant-pointers.ll b/llvm/test/DebugInfo/Generic/constant-pointers.ll index 799305b3bdc..c935aadfce9 100644 --- a/llvm/test/DebugInfo/Generic/constant-pointers.ll +++ b/llvm/test/DebugInfo/Generic/constant-pointers.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj %s -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O0 -filetype=obj %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s ; Ensure that pointer constants are emitted as unsigned data. Alternatively, ; these could be signless data (dataN). diff --git a/llvm/test/DebugInfo/Generic/cross-cu-inlining.ll b/llvm/test/DebugInfo/Generic/cross-cu-inlining.ll index 5dea31f7705..65f228458c3 100644 --- a/llvm/test/DebugInfo/Generic/cross-cu-inlining.ll +++ b/llvm/test/DebugInfo/Generic/cross-cu-inlining.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj -dwarf-linkage-names=All < %s | llvm-dwarfdump -debug-dump=info - | FileCheck -implicit-check-not=DW_TAG %s +; RUN: %llc_dwarf -O0 -filetype=obj -dwarf-linkage-names=All < %s | llvm-dwarfdump -debug-info - | FileCheck -implicit-check-not=DW_TAG %s ; RUN: %llc_dwarf -dwarf-accel-tables=Enable -dwarf-linkage-names=All -O0 -filetype=obj < %s | llvm-dwarfdump - | FileCheck --check-prefix=CHECK-ACCEL --check-prefix=CHECK %s ; Build from source: diff --git a/llvm/test/DebugInfo/Generic/cross-cu-linkonce-distinct.ll b/llvm/test/DebugInfo/Generic/cross-cu-linkonce-distinct.ll index 8af3c8a88c0..ffad3a180c2 100644 --- a/llvm/test/DebugInfo/Generic/cross-cu-linkonce-distinct.ll +++ b/llvm/test/DebugInfo/Generic/cross-cu-linkonce-distinct.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; Testing that two distinct (distinct by writing them in separate files, while ; still fulfilling C++'s ODR by having identical token sequences) functions, diff --git a/llvm/test/DebugInfo/Generic/cross-cu-linkonce.ll b/llvm/test/DebugInfo/Generic/cross-cu-linkonce.ll index 0f8b4bbdf8e..65f000ed8fe 100644 --- a/llvm/test/DebugInfo/Generic/cross-cu-linkonce.ll +++ b/llvm/test/DebugInfo/Generic/cross-cu-linkonce.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; Built from source: ; $ clang++ a.cpp b.cpp -g -c -emit-llvm diff --git a/llvm/test/DebugInfo/Generic/dead-argument-order.ll b/llvm/test/DebugInfo/Generic/dead-argument-order.ll index 12238290546..220d411906b 100644 --- a/llvm/test/DebugInfo/Generic/dead-argument-order.ll +++ b/llvm/test/DebugInfo/Generic/dead-argument-order.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; Built from the following source with clang -O1 ; struct S { int i; }; diff --git a/llvm/test/DebugInfo/Generic/def-line.ll b/llvm/test/DebugInfo/Generic/def-line.ll index 266066f90eb..5a9781bb4ac 100644 --- a/llvm/test/DebugInfo/Generic/def-line.ll +++ b/llvm/test/DebugInfo/Generic/def-line.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf < %s -filetype=obj | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf < %s -filetype=obj | llvm-dwarfdump -debug-info - | FileCheck %s ; Given the following source, ensure that the decl_line/file is correctly ; emitted and omitted on definitions if it mismatches/matches the declaration diff --git a/llvm/test/DebugInfo/Generic/discriminator.ll b/llvm/test/DebugInfo/Generic/discriminator.ll index 9ac644f5a3f..ee7e83fd6ae 100644 --- a/llvm/test/DebugInfo/Generic/discriminator.ll +++ b/llvm/test/DebugInfo/Generic/discriminator.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf < %s -filetype=obj | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf < %s -filetype=obj | llvm-dwarfdump -debug-info - | FileCheck %s ; Given the following source, ensure that the discriminator is emitted for ; the inlined callsite. diff --git a/llvm/test/DebugInfo/Generic/dwarf-public-names.ll b/llvm/test/DebugInfo/Generic/dwarf-public-names.ll index b8ff3950bd6..f2472a928e1 100644 --- a/llvm/test/DebugInfo/Generic/dwarf-public-names.ll +++ b/llvm/test/DebugInfo/Generic/dwarf-public-names.ll @@ -1,7 +1,7 @@ ; REQUIRES: object-emission ; RUN: %llc_dwarf -generate-dwarf-pub-sections=Enable -filetype=obj -o %t.o < %s -; RUN: llvm-dwarfdump -debug-dump=pubnames %t.o | FileCheck %s +; RUN: llvm-dwarfdump -debug-pubnames %t.o | FileCheck %s ; ModuleID = 'dwarf-public-names.cpp' ; ; Generated from: diff --git a/llvm/test/DebugInfo/Generic/enum-types.ll b/llvm/test/DebugInfo/Generic/enum-types.ll index 5c563317a65..7c96e56ae19 100644 --- a/llvm/test/DebugInfo/Generic/enum-types.ll +++ b/llvm/test/DebugInfo/Generic/enum-types.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission ; -; RUN: %llc_dwarf -filetype=obj -O0 -dwarf-linkage-names=All < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj -O0 -dwarf-linkage-names=All < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; Make sure we can handle enums with the same identifier but in enum types of ; different compile units. diff --git a/llvm/test/DebugInfo/Generic/imported-name-inlined.ll b/llvm/test/DebugInfo/Generic/imported-name-inlined.ll index 1da2d1490ef..637a934c860 100644 --- a/llvm/test/DebugInfo/Generic/imported-name-inlined.ll +++ b/llvm/test/DebugInfo/Generic/imported-name-inlined.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck --implicit-check-not "{{DW_TAG|NULL}}" %s +; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck --implicit-check-not "{{DW_TAG|NULL}}" %s ; Generated from the following source: ; namespace ns { diff --git a/llvm/test/DebugInfo/Generic/incorrect-variable-debugloc.ll b/llvm/test/DebugInfo/Generic/incorrect-variable-debugloc.ll index 0cb73afe6f4..c5add6d1cf9 100644 --- a/llvm/test/DebugInfo/Generic/incorrect-variable-debugloc.ll +++ b/llvm/test/DebugInfo/Generic/incorrect-variable-debugloc.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O2 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O2 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; This is a test case that's as reduced as I can get it, though I haven't fully ; understood the mechanisms by which this bug occurs, so perhaps there's further diff --git a/llvm/test/DebugInfo/Generic/inline-scopes.ll b/llvm/test/DebugInfo/Generic/inline-scopes.ll index 7e28ef0d34a..b1b113004cb 100644 --- a/llvm/test/DebugInfo/Generic/inline-scopes.ll +++ b/llvm/test/DebugInfo/Generic/inline-scopes.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; bool f(); ; inline __attribute__((always_inline)) int f1() { diff --git a/llvm/test/DebugInfo/Generic/linkage-name-abstract.ll b/llvm/test/DebugInfo/Generic/linkage-name-abstract.ll index e3d7520bb2f..196e42b0a64 100644 --- a/llvm/test/DebugInfo/Generic/linkage-name-abstract.ll +++ b/llvm/test/DebugInfo/Generic/linkage-name-abstract.ll @@ -1,8 +1,8 @@ -; RUN: %llc_dwarf -O0 -filetype=obj -dwarf-linkage-names=Abstract < %s | llvm-dwarfdump -debug-dump=info - > %t +; RUN: %llc_dwarf -O0 -filetype=obj -dwarf-linkage-names=Abstract < %s | llvm-dwarfdump -debug-info - > %t ; RUN: FileCheck %s -check-prefix=ONENAME < %t ; RUN: FileCheck %s -check-prefix=REF < %t ; Verify tuning for SCE gets us Abstract only. -; RUN: %llc_dwarf -O0 -filetype=obj -debugger-tune=sce < %s | llvm-dwarfdump -debug-dump=info - > %t +; RUN: %llc_dwarf -O0 -filetype=obj -debugger-tune=sce < %s | llvm-dwarfdump -debug-info - > %t ; RUN: FileCheck %s -check-prefix=ONENAME < %t ; RUN: FileCheck %s -check-prefix=REF < %t ; REQUIRES: object-emission diff --git a/llvm/test/DebugInfo/Generic/lto-comp-dir.ll b/llvm/test/DebugInfo/Generic/lto-comp-dir.ll index eba9b3b1810..c624d4f181d 100644 --- a/llvm/test/DebugInfo/Generic/lto-comp-dir.ll +++ b/llvm/test/DebugInfo/Generic/lto-comp-dir.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf < %s -filetype=obj | llvm-dwarfdump -debug-dump=line - | FileCheck %s +; RUN: %llc_dwarf < %s -filetype=obj | llvm-dwarfdump -debug-line - | FileCheck %s ; RUN: %llc_dwarf < %s -filetype=asm | FileCheck --check-prefix=ASM %s ; If multiple line tables are emitted, one per CU, those line tables can diff --git a/llvm/test/DebugInfo/Generic/mainsubprogram.ll b/llvm/test/DebugInfo/Generic/mainsubprogram.ll index 68a505a5819..e62efae35ee 100644 --- a/llvm/test/DebugInfo/Generic/mainsubprogram.ll +++ b/llvm/test/DebugInfo/Generic/mainsubprogram.ll @@ -1,7 +1,7 @@ ; REQUIRES: object-emission ; RUN: %llc_dwarf -O0 -filetype=obj < %s > %t -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; Make sure we're emitting DW_AT_main_subprogram. ; CHECK: DW_TAG_subprogram diff --git a/llvm/test/DebugInfo/Generic/member-order.ll b/llvm/test/DebugInfo/Generic/member-order.ll index b6be71149a8..5c2150274c6 100644 --- a/llvm/test/DebugInfo/Generic/member-order.ll +++ b/llvm/test/DebugInfo/Generic/member-order.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -filetype=obj -O0 < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj -O0 < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; generated by clang from: ; struct foo { diff --git a/llvm/test/DebugInfo/Generic/member-pointers.ll b/llvm/test/DebugInfo/Generic/member-pointers.ll index 96b881b41a4..0d542a6bfd0 100644 --- a/llvm/test/DebugInfo/Generic/member-pointers.ll +++ b/llvm/test/DebugInfo/Generic/member-pointers.ll @@ -2,7 +2,7 @@ ; XFAIL: hexagon ; RUN: %llc_dwarf -filetype=obj -O0 < %s > %t -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; CHECK: DW_TAG_ptr_to_member_type ; CHECK: DW_TAG_ptr_to_member_type ; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE:0x[0-9a-f]+]]}) diff --git a/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll b/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll index e099b77086c..5b87185dc5b 100644 --- a/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll +++ b/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; The formal parameter 'b' for Function 'x' when inlined within 'a' is lost on ; mips and powerpc64 (and on x86_64 at at least -O2). Presumably this is a diff --git a/llvm/test/DebugInfo/Generic/multiline.ll b/llvm/test/DebugInfo/Generic/multiline.ll index ea45e9233ba..2bfe73e6f41 100644 --- a/llvm/test/DebugInfo/Generic/multiline.ll +++ b/llvm/test/DebugInfo/Generic/multiline.ll @@ -1,5 +1,5 @@ ; RUN: llc -filetype=asm -asm-verbose=0 -O0 < %s | FileCheck %s -; RUN: llc -filetype=obj -O0 < %s | llvm-dwarfdump -debug-dump=line - | FileCheck %s --check-prefix=INT +; RUN: llc -filetype=obj -O0 < %s | llvm-dwarfdump -debug-line - | FileCheck %s --check-prefix=INT ; Check that the assembly output properly handles is_stmt changes. And since ; we're testing anyway, check the integrated assembler too. diff --git a/llvm/test/DebugInfo/Generic/namespace_function_definition.ll b/llvm/test/DebugInfo/Generic/namespace_function_definition.ll index 7d7725dec62..cb7d7ec8b89 100644 --- a/llvm/test/DebugInfo/Generic/namespace_function_definition.ll +++ b/llvm/test/DebugInfo/Generic/namespace_function_definition.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj -dwarf-linkage-names=All < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O0 -filetype=obj -dwarf-linkage-names=All < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; Generated from clang with the following source: ; namespace ns { diff --git a/llvm/test/DebugInfo/Generic/namespace_inline_function_definition.ll b/llvm/test/DebugInfo/Generic/namespace_inline_function_definition.ll index f029ab277d7..5e882712e23 100644 --- a/llvm/test/DebugInfo/Generic/namespace_inline_function_definition.ll +++ b/llvm/test/DebugInfo/Generic/namespace_inline_function_definition.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj -dwarf-linkage-names=All < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O0 -filetype=obj -dwarf-linkage-names=All < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; Generate from clang with the following source. Note that the definition of ; the inline function follows its use to workaround another bug that should be diff --git a/llvm/test/DebugInfo/Generic/recursive_inlining.ll b/llvm/test/DebugInfo/Generic/recursive_inlining.ll index 68dabb93dac..08d6829391b 100644 --- a/llvm/test/DebugInfo/Generic/recursive_inlining.ll +++ b/llvm/test/DebugInfo/Generic/recursive_inlining.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -filetype=obj -O0 < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj -O0 < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; This isn't a very pretty test case - I imagine there might be other ways to ; tickle the optimizers into producing the desired code, but I haven't found diff --git a/llvm/test/DebugInfo/Generic/restrict.ll b/llvm/test/DebugInfo/Generic/restrict.ll index 2f99e660ddd..59447e0a2cf 100644 --- a/llvm/test/DebugInfo/Generic/restrict.ll +++ b/llvm/test/DebugInfo/Generic/restrict.ll @@ -1,7 +1,7 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -dwarf-version=2 -O0 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck --check-prefix=CHECK --check-prefix=V2 %s -; RUN: %llc_dwarf -dwarf-version=3 -O0 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck --check-prefix=CHECK --check-prefix=V3 %s +; RUN: %llc_dwarf -dwarf-version=2 -O0 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck --check-prefix=CHECK --check-prefix=V2 %s +; RUN: %llc_dwarf -dwarf-version=3 -O0 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck --check-prefix=CHECK --check-prefix=V3 %s ; CHECK: DW_AT_name {{.*}} "dst" ; V2: DW_AT_type {{.*}} {[[PTR:0x.*]]} diff --git a/llvm/test/DebugInfo/Generic/skeletoncu.ll b/llvm/test/DebugInfo/Generic/skeletoncu.ll index 1bdfe1fdfe5..58c6753fc91 100644 --- a/llvm/test/DebugInfo/Generic/skeletoncu.ll +++ b/llvm/test/DebugInfo/Generic/skeletoncu.ll @@ -1,5 +1,5 @@ ; RUN: %llc_dwarf %s -filetype=obj -o %t -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; CHECK: DW_TAG_compile_unit ; CHECK: DW_AT_GNU_dwo_id {{.*}}abcd ; CHECK: DW_AT_GNU_dwo_name {{.*}}"my.dwo" diff --git a/llvm/test/DebugInfo/Generic/sugared-constants.ll b/llvm/test/DebugInfo/Generic/sugared-constants.ll index 28c48a529ab..ca445aa813f 100644 --- a/llvm/test/DebugInfo/Generic/sugared-constants.ll +++ b/llvm/test/DebugInfo/Generic/sugared-constants.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj %s -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O0 -filetype=obj %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s ; Use correct signedness when emitting constants of derived (sugared) types. ; CHECK: DW_AT_const_value [DW_FORM_sdata] (42) diff --git a/llvm/test/DebugInfo/Generic/thrownTypes.ll b/llvm/test/DebugInfo/Generic/thrownTypes.ll index 8e84e7bf2bf..2c8464d876e 100644 --- a/llvm/test/DebugInfo/Generic/thrownTypes.ll +++ b/llvm/test/DebugInfo/Generic/thrownTypes.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; CHECK: DW_TAG_subprogram ; CHECK: DW_AT_name {{.*}} "f" diff --git a/llvm/test/DebugInfo/Generic/tu-composite.ll b/llvm/test/DebugInfo/Generic/tu-composite.ll index 8198516305c..bff83662c69 100644 --- a/llvm/test/DebugInfo/Generic/tu-composite.ll +++ b/llvm/test/DebugInfo/Generic/tu-composite.ll @@ -1,7 +1,7 @@ ; REQUIRES: object-emission ; RUN: %llc_dwarf -filetype=obj -O0 < %s > %t -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; CHECK: [[TYPE:.*]]: DW_TAG_structure_type ; Make sure we correctly handle containing type of a struct being a type identifier. ; CHECK-NEXT: DW_AT_containing_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE]]}) diff --git a/llvm/test/DebugInfo/Generic/tu-member-pointer.ll b/llvm/test/DebugInfo/Generic/tu-member-pointer.ll index 22591c40cff..72667e12138 100644 --- a/llvm/test/DebugInfo/Generic/tu-member-pointer.ll +++ b/llvm/test/DebugInfo/Generic/tu-member-pointer.ll @@ -1,7 +1,7 @@ ; REQUIRES: object-emission ; RUN: %llc_dwarf -filetype=obj -O0 < %s > %t -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; CHECK: DW_TAG_ptr_to_member_type ; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE:0x[0-9a-f]+]]}) ; CHECK: [[TYPE]]: DW_TAG_base_type diff --git a/llvm/test/DebugInfo/Generic/two-cus-from-same-file.ll b/llvm/test/DebugInfo/Generic/two-cus-from-same-file.ll index 3009a56f952..bacb9bcf29d 100644 --- a/llvm/test/DebugInfo/Generic/two-cus-from-same-file.ll +++ b/llvm/test/DebugInfo/Generic/two-cus-from-same-file.ll @@ -6,7 +6,7 @@ ; REQUIRES: object-emission ; RUN: %llc_dwarf %s -o %t -filetype=obj -O0 -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; ModuleID = 'test.bc' diff --git a/llvm/test/DebugInfo/Generic/typedef.ll b/llvm/test/DebugInfo/Generic/typedef.ll index 5ed069a3921..2f9f953fc88 100644 --- a/llvm/test/DebugInfo/Generic/typedef.ll +++ b/llvm/test/DebugInfo/Generic/typedef.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -O0 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; From source: ; typedef void x; diff --git a/llvm/test/DebugInfo/Generic/varargs.ll b/llvm/test/DebugInfo/Generic/varargs.ll index 709d78dd597..6ea020fdc20 100644 --- a/llvm/test/DebugInfo/Generic/varargs.ll +++ b/llvm/test/DebugInfo/Generic/varargs.ll @@ -1,5 +1,5 @@ ; RUN: %llc_dwarf -O0 -filetype=obj -o %t.o %s -; RUN: llvm-dwarfdump -debug-dump=info %t.o | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t.o | FileCheck %s ; REQUIRES: object-emission ; ; Test debug info for variadic function arguments. diff --git a/llvm/test/DebugInfo/MIR/ARM/split-superreg-piece.mir b/llvm/test/DebugInfo/MIR/ARM/split-superreg-piece.mir index 40890fa0da7..5b758c255a2 100644 --- a/llvm/test/DebugInfo/MIR/ARM/split-superreg-piece.mir +++ b/llvm/test/DebugInfo/MIR/ARM/split-superreg-piece.mir @@ -1,5 +1,5 @@ # RUN: llc -start-before=livedebugvalues -filetype=obj -o - %s | \ -# RUN: llvm-dwarfdump -debug-dump=info - | FileCheck %s +# RUN: llvm-dwarfdump -debug-info - | FileCheck %s # CHECK: .debug_info contents: # CHECK: DW_TAG_variable # CHECK-NEXT: DW_AT_location diff --git a/llvm/test/DebugInfo/MIR/X86/bit-piece-dh.mir b/llvm/test/DebugInfo/MIR/X86/bit-piece-dh.mir index cd3bde10ad3..9e18a7e1ee3 100644 --- a/llvm/test/DebugInfo/MIR/X86/bit-piece-dh.mir +++ b/llvm/test/DebugInfo/MIR/X86/bit-piece-dh.mir @@ -1,4 +1,4 @@ -# RUN: llc -filetype=obj -o - %s | llvm-dwarfdump --debug-dump=info - | FileCheck %s +# RUN: llc -filetype=obj -o - %s | llvm-dwarfdump --debug-info - | FileCheck %s # CHECK: .debug_info contents: # CHECK: DW_TAG_variable # CHECK-NEXT: DW_AT_location {{.*}} (DW_OP_reg1 RDX, DW_OP_bit_piece 0x8 0x8) diff --git a/llvm/test/DebugInfo/Mips/dsr-fixed-objects.ll b/llvm/test/DebugInfo/Mips/dsr-fixed-objects.ll index 71a90942129..212f7477d15 100644 --- a/llvm/test/DebugInfo/Mips/dsr-fixed-objects.ll +++ b/llvm/test/DebugInfo/Mips/dsr-fixed-objects.ll @@ -1,5 +1,5 @@ ; RUN: llc -march=mips -mcpu=mips32r2 -O1 -filetype=obj -relocation-model=pic <%s | \ -; RUN: llvm-dwarfdump -debug-dump=all - | FileCheck %s +; RUN: llvm-dwarfdump -all - | FileCheck %s ; void foo(int *); ; diff --git a/llvm/test/DebugInfo/Mips/dsr-non-fixed-objects.ll b/llvm/test/DebugInfo/Mips/dsr-non-fixed-objects.ll index a38bd415048..8e4ffe00eef 100644 --- a/llvm/test/DebugInfo/Mips/dsr-non-fixed-objects.ll +++ b/llvm/test/DebugInfo/Mips/dsr-non-fixed-objects.ll @@ -1,5 +1,5 @@ ; RUN: llc -march=mips -mcpu=mips32r2 -O0 -filetype=obj -fast-isel=0 <%s | \ -; RUN: llvm-dwarfdump -debug-dump=all - | FileCheck %s +; RUN: llvm-dwarfdump -all - | FileCheck %s declare void @llvm.dbg.declare(metadata, metadata, metadata) diff --git a/llvm/test/DebugInfo/Mips/fn-call-line.ll b/llvm/test/DebugInfo/Mips/fn-call-line.ll index 9dda711e716..52fb945f91d 100644 --- a/llvm/test/DebugInfo/Mips/fn-call-line.ll +++ b/llvm/test/DebugInfo/Mips/fn-call-line.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=mips-linux-gnu -filetype=asm -asm-verbose=0 -O0 -relocation-model=pic < %s | FileCheck %s -; RUN: llc -mtriple=mips-linux-gnu -filetype=obj -O0 < %s | llvm-dwarfdump -debug-dump=line - | FileCheck %s --check-prefix=INT +; RUN: llc -mtriple=mips-linux-gnu -filetype=obj -O0 < %s | llvm-dwarfdump -debug-line - | FileCheck %s --check-prefix=INT ; Mips used to generate 'jumpy' debug line info around calls. The address ; calculation for each call to f1() would share the same line info so it would diff --git a/llvm/test/DebugInfo/Sparc/subreg.ll b/llvm/test/DebugInfo/Sparc/subreg.ll index 720126d3227..2cc6d627c2c 100644 --- a/llvm/test/DebugInfo/Sparc/subreg.ll +++ b/llvm/test/DebugInfo/Sparc/subreg.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj -O0 < %s -mtriple sparc64-unknown-linux-gnu | llvm-dwarfdump - -debug-dump=loc | FileCheck %s +; RUN: llc -filetype=obj -O0 < %s -mtriple sparc64-unknown-linux-gnu | llvm-dwarfdump - --debug-loc | FileCheck %s ; The undescribable 128-bit register should be split into two 64-bit registers. ; CHECK: {{.*}} - {{.*}}: DW_OP_regx D0, DW_OP_piece 0x8, DW_OP_regx D1, DW_OP_piece 0x8 diff --git a/llvm/test/DebugInfo/SystemZ/variable-loc.ll b/llvm/test/DebugInfo/SystemZ/variable-loc.ll index bae093afb5b..22ae9ebffb8 100644 --- a/llvm/test/DebugInfo/SystemZ/variable-loc.ll +++ b/llvm/test/DebugInfo/SystemZ/variable-loc.ll @@ -1,6 +1,6 @@ ; RUN: llc -mtriple=s390x-linux-gnu -disable-fp-elim < %s | FileCheck %s ; RUN: llc -mtriple=s390x-linux-gnu -disable-fp-elim -filetype=obj < %s \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck --check-prefix=DEBUG %s +; RUN: | llvm-dwarfdump -debug-info - | FileCheck --check-prefix=DEBUG %s ; ; This is a regression test making sure the location of variables is correct in ; debugging information, even if they're addressed via the frame pointer. diff --git a/llvm/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll b/llvm/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll index dd2ad2e49b7..7f5548fd80b 100644 --- a/llvm/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll +++ b/llvm/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-pc-linux-gnu %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; ModuleID = 'test.c' diff --git a/llvm/test/DebugInfo/X86/2011-12-16-BadStructRef.ll b/llvm/test/DebugInfo/X86/2011-12-16-BadStructRef.ll index 73d48675d91..e7f050cead2 100644 --- a/llvm/test/DebugInfo/X86/2011-12-16-BadStructRef.ll +++ b/llvm/test/DebugInfo/X86/2011-12-16-BadStructRef.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-macosx10.7 %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; CHECK: b_ref ; CHECK-NOT: AT_bit_size diff --git a/llvm/test/DebugInfo/X86/DIModule.ll b/llvm/test/DebugInfo/X86/DIModule.ll index eacdfe10f53..97c639c9a8e 100644 --- a/llvm/test/DebugInfo/X86/DIModule.ll +++ b/llvm/test/DebugInfo/X86/DIModule.ll @@ -1,6 +1,6 @@ ; ModuleID = '/Volumes/Data/apple-internal/llvm/tools/clang/test/Modules/debug-info-moduleimport.m' ; RUN: llc %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; CHECK: DW_TAG_module ; CHECK-NEXT: DW_AT_name {{.*}}"DebugModule" ; CHECK-NEXT: DW_AT_LLVM_config_macros {{.*}}"-DMODULES=0" diff --git a/llvm/test/DebugInfo/X86/DIModuleContext.ll b/llvm/test/DebugInfo/X86/DIModuleContext.ll index f245860dd15..b3c17aa48ce 100644 --- a/llvm/test/DebugInfo/X86/DIModuleContext.ll +++ b/llvm/test/DebugInfo/X86/DIModuleContext.ll @@ -1,7 +1,7 @@ source_filename = "test/DebugInfo/X86/DIModuleContext.ll" target triple = "x86_64-apple-macosx" ; RUN: %llc_dwarf %s -o - -filetype=obj \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: | llvm-dwarfdump -debug-info - | FileCheck %s ; CHECK: DW_TAG_module ; CHECK-NOT: NULL ; CHECK: DW_TAG_structure_type diff --git a/llvm/test/DebugInfo/X86/DW_AT_byte_size.ll b/llvm/test/DebugInfo/X86/DW_AT_byte_size.ll index 3fd4884d822..5af81ed5b53 100644 --- a/llvm/test/DebugInfo/X86/DW_AT_byte_size.ll +++ b/llvm/test/DebugInfo/X86/DW_AT_byte_size.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=all %t | FileCheck %s +; RUN: llvm-dwarfdump -all %t | FileCheck %s ; Checks that we don't emit a size for a pointer type. ; CHECK: DW_TAG_pointer_type diff --git a/llvm/test/DebugInfo/X86/DW_AT_linkage_name.ll b/llvm/test/DebugInfo/X86/DW_AT_linkage_name.ll index e20ef418cfe..3313a4d9223 100644 --- a/llvm/test/DebugInfo/X86/DW_AT_linkage_name.ll +++ b/llvm/test/DebugInfo/X86/DW_AT_linkage_name.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-macosx %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; ; struct A { ; A(int i); diff --git a/llvm/test/DebugInfo/X86/DW_AT_object_pointer.ll b/llvm/test/DebugInfo/X86/DW_AT_object_pointer.ll index 554f6880490..5091199f276 100644 --- a/llvm/test/DebugInfo/X86/DW_AT_object_pointer.ll +++ b/llvm/test/DebugInfo/X86/DW_AT_object_pointer.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; CHECK: DW_TAG_formal_parameter [ ; CHECK-NOT: "" diff --git a/llvm/test/DebugInfo/X86/DW_AT_specification.ll b/llvm/test/DebugInfo/X86/DW_AT_specification.ll index 5610a5b6a4b..ae3efb62c43 100644 --- a/llvm/test/DebugInfo/X86/DW_AT_specification.ll +++ b/llvm/test/DebugInfo/X86/DW_AT_specification.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; test that the DW_AT_specification is a back edge in the file. diff --git a/llvm/test/DebugInfo/X86/DW_AT_stmt_list_sec_offset.ll b/llvm/test/DebugInfo/X86/DW_AT_stmt_list_sec_offset.ll index ee4da44181c..a23c17c90c3 100644 --- a/llvm/test/DebugInfo/X86/DW_AT_stmt_list_sec_offset.ll +++ b/llvm/test/DebugInfo/X86/DW_AT_stmt_list_sec_offset.ll @@ -1,7 +1,7 @@ ; RUN: llc -mtriple=i686-w64-mingw32 -o %t -filetype=obj %s -; RUN: llvm-dwarfdump -debug-dump=all %t | FileCheck %s +; RUN: llvm-dwarfdump -all %t | FileCheck %s ; RUN: llc -mtriple=i686-w64-mingw32 -o %t -filetype=obj -dwarf-version=3 %s -; RUN: llvm-dwarfdump -debug-dump=all %t | FileCheck %s -check-prefix=DWARF3 +; RUN: llvm-dwarfdump -all %t | FileCheck %s -check-prefix=DWARF3 ; CHECK: DW_AT_stmt_list [DW_FORM_sec_offset] ; DWARF3: DW_AT_stmt_list [DW_FORM_data4] diff --git a/llvm/test/DebugInfo/X86/DW_TAG_friend.ll b/llvm/test/DebugInfo/X86/DW_TAG_friend.ll index dcf403fbf33..0ad16650f6d 100644 --- a/llvm/test/DebugInfo/X86/DW_TAG_friend.ll +++ b/llvm/test/DebugInfo/X86/DW_TAG_friend.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; Check that the friend tag is there and is followed by a DW_AT_friend that has a reference back. diff --git a/llvm/test/DebugInfo/X86/FrameIndexExprs.ll b/llvm/test/DebugInfo/X86/FrameIndexExprs.ll index 581fa37260a..9696b9d4a58 100644 --- a/llvm/test/DebugInfo/X86/FrameIndexExprs.ll +++ b/llvm/test/DebugInfo/X86/FrameIndexExprs.ll @@ -1,6 +1,6 @@ ; PR31381: An assertion in the DWARF backend when fragments in MMI slots are ; sorted by largest offset first. -; RUN: llc -mtriple=x86_64-apple-darwin -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -mtriple=x86_64-apple-darwin -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; CHECK: DW_TAG_formal_parameter ; CHECK: DW_TAG_formal_parameter ; CHECK-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_fbreg -8, DW_OP_piece 0x3, DW_OP_piece 0x6, DW_OP_fbreg -3, DW_OP_piece 0x3) diff --git a/llvm/test/DebugInfo/X86/PR26148.ll b/llvm/test/DebugInfo/X86/PR26148.ll index 1741b574d93..b050953902a 100644 --- a/llvm/test/DebugInfo/X86/PR26148.ll +++ b/llvm/test/DebugInfo/X86/PR26148.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj -o - < %s | llvm-dwarfdump - -debug-dump=loc | FileCheck %s +; RUN: llc -filetype=obj -o - < %s | llvm-dwarfdump - --debug-loc | FileCheck %s ; ; Created using clang -g -O3 from: ; struct S0 { diff --git a/llvm/test/DebugInfo/X86/abstract_origin.ll b/llvm/test/DebugInfo/X86/abstract_origin.ll index 05abc0481db..b4a7f787009 100644 --- a/llvm/test/DebugInfo/X86/abstract_origin.ll +++ b/llvm/test/DebugInfo/X86/abstract_origin.ll @@ -1,4 +1,4 @@ -; RUN: %llc_dwarf -filetype=obj %s -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s ; Generated at -O2 from: ; void f(); ; __attribute__((always_inline)) void g() { diff --git a/llvm/test/DebugInfo/X86/align_c11.ll b/llvm/test/DebugInfo/X86/align_c11.ll index c76ed274ab4..073b704b0b2 100644 --- a/llvm/test/DebugInfo/X86/align_c11.ll +++ b/llvm/test/DebugInfo/X86/align_c11.ll @@ -1,4 +1,4 @@ -; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; REQUIRES: object-emission ; Generated by clang -c -g -std=c11 -S -emit-llvm from the following C11 source diff --git a/llvm/test/DebugInfo/X86/align_cpp11.ll b/llvm/test/DebugInfo/X86/align_cpp11.ll index c172b5d11c8..29eed1cec64 100644 --- a/llvm/test/DebugInfo/X86/align_cpp11.ll +++ b/llvm/test/DebugInfo/X86/align_cpp11.ll @@ -1,4 +1,4 @@ -; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; REQUIRES: object-emission ; Generated by clang++ -c -g -std=c++11 -S -emit-llvm from the following C++11 source diff --git a/llvm/test/DebugInfo/X86/align_objc.ll b/llvm/test/DebugInfo/X86/align_objc.ll index 2241dde009b..27f7be509af 100644 --- a/llvm/test/DebugInfo/X86/align_objc.ll +++ b/llvm/test/DebugInfo/X86/align_objc.ll @@ -1,4 +1,4 @@ -; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; REQUIRES: object-emission ; typedef struct __attribute__((aligned (128))) { diff --git a/llvm/test/DebugInfo/X86/aligned_stack_var.ll b/llvm/test/DebugInfo/X86/aligned_stack_var.ll index 8f58399da59..a4bdc296168 100644 --- a/llvm/test/DebugInfo/X86/aligned_stack_var.ll +++ b/llvm/test/DebugInfo/X86/aligned_stack_var.ll @@ -1,5 +1,5 @@ ; RUN: llc %s -mtriple=x86_64-pc-linux-gnu -O0 -filetype=obj -o %t -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; If stack is realigned, we shouldn't describe locations of local ; variables by giving offset from the frame pointer (%rbp): diff --git a/llvm/test/DebugInfo/X86/arange.ll b/llvm/test/DebugInfo/X86/arange.ll index 7b81eee9d2b..5a168092bf4 100644 --- a/llvm/test/DebugInfo/X86/arange.ll +++ b/llvm/test/DebugInfo/X86/arange.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: llc -mtriple=x86_64-linux -O0 -filetype=obj -generate-arange-section < %s | llvm-dwarfdump -debug-dump=aranges - | FileCheck %s +; RUN: llc -mtriple=x86_64-linux -O0 -filetype=obj -generate-arange-section < %s | llvm-dwarfdump -debug-aranges - | FileCheck %s ; RUN: llc -mtriple=x86_64-linux -O0 -filetype=obj -generate-arange-section < %s | llvm-readobj --relocations - | FileCheck --check-prefix=OBJ %s ; extern int i; diff --git a/llvm/test/DebugInfo/X86/array.ll b/llvm/test/DebugInfo/X86/array.ll index eba0bb48986..20c4bb72c8f 100644 --- a/llvm/test/DebugInfo/X86/array.ll +++ b/llvm/test/DebugInfo/X86/array.ll @@ -13,7 +13,7 @@ ; } ; ; RUN: llc -filetype=asm %s -o - | FileCheck %s -; RUN: llc -filetype=obj %s -o - | llvm-dwarfdump - --debug-dump=info | FileCheck %s --check-prefix=DWARF +; RUN: llc -filetype=obj %s -o - | llvm-dwarfdump - ---debug-info | FileCheck %s --check-prefix=DWARF ; CHECK-LABEL: _main: ; CHECK: movaps {{.*}}, (%rsp) diff --git a/llvm/test/DebugInfo/X86/atomic-c11-dwarf-4.ll b/llvm/test/DebugInfo/X86/atomic-c11-dwarf-4.ll index 197f3808015..efbf1a2be51 100644 --- a/llvm/test/DebugInfo/X86/atomic-c11-dwarf-4.ll +++ b/llvm/test/DebugInfo/X86/atomic-c11-dwarf-4.ll @@ -1,4 +1,4 @@ -; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; REQUIRES: object-emission ; Generated by clang -c -g -std=c11 -S -emit-llvm from the following C11 source diff --git a/llvm/test/DebugInfo/X86/atomic-c11-dwarf-5.ll b/llvm/test/DebugInfo/X86/atomic-c11-dwarf-5.ll index c9302939661..859617681c8 100644 --- a/llvm/test/DebugInfo/X86/atomic-c11-dwarf-5.ll +++ b/llvm/test/DebugInfo/X86/atomic-c11-dwarf-5.ll @@ -1,4 +1,4 @@ -; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; REQUIRES: object-emission ; Generated by clang -c -g -std=c11 -S -emit-llvm from the following C11 source diff --git a/llvm/test/DebugInfo/X86/bitfields-dwarf4.ll b/llvm/test/DebugInfo/X86/bitfields-dwarf4.ll index eee1002a10c..aadfdae3f30 100644 --- a/llvm/test/DebugInfo/X86/bitfields-dwarf4.ll +++ b/llvm/test/DebugInfo/X86/bitfields-dwarf4.ll @@ -1,7 +1,7 @@ ; RUN: llc -mtriple x86_64-apple-macosx -O0 -filetype=obj -o - %s \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: | llvm-dwarfdump -debug-info - | FileCheck %s ; RUN: llc -mtriple x86_64-gnu-linux -O0 -filetype=obj -o - %s \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck %s --check-prefix=LINUX +; RUN: | llvm-dwarfdump -debug-info - | FileCheck %s --check-prefix=LINUX ; LINUX-NOT: DW_AT_data_bit_offset ; ; Generated from: diff --git a/llvm/test/DebugInfo/X86/bitfields.ll b/llvm/test/DebugInfo/X86/bitfields.ll index 63978f18171..87a7c49f1d2 100644 --- a/llvm/test/DebugInfo/X86/bitfields.ll +++ b/llvm/test/DebugInfo/X86/bitfields.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple x86_64-apple-macosx -O0 -filetype=obj -o %t_le.o %s -; RUN: llvm-dwarfdump -debug-dump=info %t_le.o | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t_le.o | FileCheck %s ; Produced at -O0 from: ; struct bitfield { diff --git a/llvm/test/DebugInfo/X86/block-capture.ll b/llvm/test/DebugInfo/X86/block-capture.ll index 576987795c5..3e1dbcb211d 100644 --- a/llvm/test/DebugInfo/X86/block-capture.ll +++ b/llvm/test/DebugInfo/X86/block-capture.ll @@ -1,5 +1,5 @@ ; RUN: llc %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; Checks that we emit debug info for the block variable declare. ; CHECK: DW_TAG_subprogram diff --git a/llvm/test/DebugInfo/X86/byvalstruct.ll b/llvm/test/DebugInfo/X86/byvalstruct.ll index 1474a892954..f5667e000bb 100644 --- a/llvm/test/DebugInfo/X86/byvalstruct.ll +++ b/llvm/test/DebugInfo/X86/byvalstruct.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-macosx10.8.0 -O0 -filetype=obj -o %t %s -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; Test that we generate debug info for by-value struct args that are not used. ; ; CHECK: DW_TAG_formal_parameter diff --git a/llvm/test/DebugInfo/X86/c-type-units.ll b/llvm/test/DebugInfo/X86/c-type-units.ll index 8e0bafae6ef..66e28c299f8 100644 --- a/llvm/test/DebugInfo/X86/c-type-units.ll +++ b/llvm/test/DebugInfo/X86/c-type-units.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: llc -o - %s -filetype=obj -O0 -generate-dwarf-pub-sections=Disable -generate-type-units -mtriple=x86_64-unknown-linux-gnu | llvm-dwarfdump -debug-dump=types - | FileCheck %s +; RUN: llc -o - %s -filetype=obj -O0 -generate-dwarf-pub-sections=Disable -generate-type-units -mtriple=x86_64-unknown-linux-gnu | llvm-dwarfdump -debug-types - | FileCheck %s ; struct foo { ; } f; diff --git a/llvm/test/DebugInfo/X86/clang-module.ll b/llvm/test/DebugInfo/X86/clang-module.ll index 2d220368449..39023502b78 100644 --- a/llvm/test/DebugInfo/X86/clang-module.ll +++ b/llvm/test/DebugInfo/X86/clang-module.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o - -filetype=obj \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: | llvm-dwarfdump -debug-info - | FileCheck %s ; Clang modules leave Skeleton CUs as breadcrumbs to point from the object files ; to the pcm containing the module's debug info. diff --git a/llvm/test/DebugInfo/X86/concrete_out_of_line.ll b/llvm/test/DebugInfo/X86/concrete_out_of_line.ll index f1615cf82c3..4df108cb8bf 100644 --- a/llvm/test/DebugInfo/X86/concrete_out_of_line.ll +++ b/llvm/test/DebugInfo/X86/concrete_out_of_line.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=x86_64-linux < %s -filetype=obj | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -mtriple=x86_64-linux < %s -filetype=obj | llvm-dwarfdump -debug-info - | FileCheck %s ; test that we add DW_AT_inline even when we only have concrete out of line ; instances. diff --git a/llvm/test/DebugInfo/X86/constant-aggregate.ll b/llvm/test/DebugInfo/X86/constant-aggregate.ll index 33c3a46e812..26ee50408a4 100644 --- a/llvm/test/DebugInfo/X86/constant-aggregate.ll +++ b/llvm/test/DebugInfo/X86/constant-aggregate.ll @@ -1,5 +1,5 @@ ; RUN: llc %s -filetype=obj -o %t.o -; RUN: llvm-dwarfdump -debug-dump=info %t.o | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t.o | FileCheck %s ; Test emitting a constant for an aggregate type. ; ; clang -S -O1 -emit-llvm diff --git a/llvm/test/DebugInfo/X86/constant-loclist.ll b/llvm/test/DebugInfo/X86/constant-loclist.ll index 1ab34bc5079..c4f7f68daab 100644 --- a/llvm/test/DebugInfo/X86/constant-loclist.ll +++ b/llvm/test/DebugInfo/X86/constant-loclist.ll @@ -1,4 +1,4 @@ -; RUN: %llc_dwarf -filetype=obj %s -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s ; A hand-written testcase to check 64-bit constant handling in location lists. diff --git a/llvm/test/DebugInfo/X86/cu-ranges-odr.ll b/llvm/test/DebugInfo/X86/cu-ranges-odr.ll index 4a0e67f5c57..b2ed995ed4f 100644 --- a/llvm/test/DebugInfo/X86/cu-ranges-odr.ll +++ b/llvm/test/DebugInfo/X86/cu-ranges-odr.ll @@ -1,5 +1,5 @@ ; RUN: llc -split-dwarf-file=foo.dwo -O0 %s -mtriple=x86_64-unknown-linux-gnu -filetype=obj -o %t -; RUN: llvm-dwarfdump -debug-dump=all %t | FileCheck %s +; RUN: llvm-dwarfdump -all %t | FileCheck %s ; RUN: llvm-readobj --relocations %t | FileCheck --check-prefix=CHECK-RELOCS %s ; From: diff --git a/llvm/test/DebugInfo/X86/cu-ranges.ll b/llvm/test/DebugInfo/X86/cu-ranges.ll index f2540589b24..020d3ffd93b 100644 --- a/llvm/test/DebugInfo/X86/cu-ranges.ll +++ b/llvm/test/DebugInfo/X86/cu-ranges.ll @@ -1,9 +1,9 @@ ; RUN: llc -split-dwarf-file=foo.dwo -O0 %s -function-sections -mtriple=x86_64-unknown-linux-gnu -filetype=obj -o %t -; RUN: llvm-dwarfdump -debug-dump=abbrev %t | FileCheck --check-prefix=FUNCTION-SECTIONS %s +; RUN: llvm-dwarfdump -debug-abbrev %t | FileCheck --check-prefix=FUNCTION-SECTIONS %s ; RUN: llvm-readobj --relocations %t | FileCheck --check-prefix=FUNCTION-SECTIONS-RELOCS %s ; RUN: llc -split-dwarf-file=foo.dwo -O0 %s -mtriple=x86_64-unknown-linux-gnu -filetype=obj -o %t -; RUN: llvm-dwarfdump -debug-dump=abbrev %t | FileCheck --check-prefix=NO-FUNCTION-SECTIONS %s +; RUN: llvm-dwarfdump -debug-abbrev %t | FileCheck --check-prefix=NO-FUNCTION-SECTIONS %s ; From: ; int foo (int a) { diff --git a/llvm/test/DebugInfo/X86/data_member_location.ll b/llvm/test/DebugInfo/X86/data_member_location.ll index 982630669a4..eddee7c9700 100644 --- a/llvm/test/DebugInfo/X86/data_member_location.ll +++ b/llvm/test/DebugInfo/X86/data_member_location.ll @@ -1,5 +1,5 @@ -; RUN: llc -mtriple=x86_64-linux -O0 -o - -filetype=obj < %s | llvm-dwarfdump -debug-dump=info -| FileCheck %s -; RUN: llc -mtriple=x86_64-linux -dwarf-version=2 -O0 -o - -filetype=obj < %s | llvm-dwarfdump -debug-dump=info -| FileCheck -check-prefix=DWARF2 %s +; RUN: llc -mtriple=x86_64-linux -O0 -o - -filetype=obj < %s | llvm-dwarfdump -debug-info -| FileCheck %s +; RUN: llc -mtriple=x86_64-linux -dwarf-version=2 -O0 -o - -filetype=obj < %s | llvm-dwarfdump -debug-info -| FileCheck -check-prefix=DWARF2 %s ; Generated from Clang with the following source: ; diff --git a/llvm/test/DebugInfo/X86/dbg-abstract-vars-g-gmlt.ll b/llvm/test/DebugInfo/X86/dbg-abstract-vars-g-gmlt.ll index a4e40a20da5..07c92a565d7 100644 --- a/llvm/test/DebugInfo/X86/dbg-abstract-vars-g-gmlt.ll +++ b/llvm/test/DebugInfo/X86/dbg-abstract-vars-g-gmlt.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-dwarfdump - -debug-dump=info | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-dwarfdump - --debug-info | FileCheck %s ; ; IR module created as follows: ; clang -emit-llvm -S db-abs-1.cpp -o db-abs-1.ll -g diff --git a/llvm/test/DebugInfo/X86/dbg-const-int.ll b/llvm/test/DebugInfo/X86/dbg-const-int.ll index bfda65477cb..4191dacfa27 100644 --- a/llvm/test/DebugInfo/X86/dbg-const-int.ll +++ b/llvm/test/DebugInfo/X86/dbg-const-int.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj < %s \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: | llvm-dwarfdump -debug-info - | FileCheck %s target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" target triple = "x86_64-apple-macosx10.6.7" ; Radar 9511391 diff --git a/llvm/test/DebugInfo/X86/dbg-declare-alloca.ll b/llvm/test/DebugInfo/X86/dbg-declare-alloca.ll index 2030d7c0f74..a74673d8b15 100644 --- a/llvm/test/DebugInfo/X86/dbg-declare-alloca.ll +++ b/llvm/test/DebugInfo/X86/dbg-declare-alloca.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s | FileCheck %s -; RUN: llc < %s -filetype=obj | llvm-dwarfdump - -debug-dump=info | FileCheck %s --check-prefix=DWARF +; RUN: llc < %s -filetype=obj | llvm-dwarfdump - --debug-info | FileCheck %s --check-prefix=DWARF ; This should use the frame index side table for allocas, not DBG_VALUE ; instructions. For SDAG ISel, this test would see an SDNode materializing the diff --git a/llvm/test/DebugInfo/X86/dbg-declare.ll b/llvm/test/DebugInfo/X86/dbg-declare.ll index 78e487d9e7e..96e7550ea65 100644 --- a/llvm/test/DebugInfo/X86/dbg-declare.ll +++ b/llvm/test/DebugInfo/X86/dbg-declare.ll @@ -1,6 +1,6 @@ ; RUN: llc < %s -O0 -mtriple x86_64-apple-darwin | FileCheck %s ; RUN: llc < %s -O0 -mtriple x86_64-apple-darwin -filetype=obj \ -; RUN: | llvm-dwarfdump - -debug-dump=info | FileCheck %s --check-prefix=DWARF +; RUN: | llvm-dwarfdump - --debug-info | FileCheck %s --check-prefix=DWARF ; <rdar://problem/11134152> ; CHECK-LABEL: _foo: diff --git a/llvm/test/DebugInfo/X86/dbg-merge-loc-entry.ll b/llvm/test/DebugInfo/X86/dbg-merge-loc-entry.ll index 7fa66499809..bfc1dbafbc9 100644 --- a/llvm/test/DebugInfo/X86/dbg-merge-loc-entry.ll +++ b/llvm/test/DebugInfo/X86/dbg-merge-loc-entry.ll @@ -1,7 +1,7 @@ ; RUN: llc < %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; RUN: llc < %s -o %t -filetype=obj -regalloc=basic -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" target triple = "x86_64-apple-darwin8" diff --git a/llvm/test/DebugInfo/X86/dbg-value-const-byref.ll b/llvm/test/DebugInfo/X86/dbg-value-const-byref.ll index a1a468931d4..627800f7a21 100644 --- a/llvm/test/DebugInfo/X86/dbg-value-const-byref.ll +++ b/llvm/test/DebugInfo/X86/dbg-value-const-byref.ll @@ -1,4 +1,4 @@ -; RUN: llc -O1 -filetype=obj -o - %s | llvm-dwarfdump -debug-dump=all - | FileCheck %s +; RUN: llc -O1 -filetype=obj -o - %s | llvm-dwarfdump -all - | FileCheck %s ; Generated with -O1 from: ; int f1(); ; void f2(int*); diff --git a/llvm/test/DebugInfo/X86/dbg-value-g-gmlt.ll b/llvm/test/DebugInfo/X86/dbg-value-g-gmlt.ll index fe028037be2..6839dbd51e5 100644 --- a/llvm/test/DebugInfo/X86/dbg-value-g-gmlt.ll +++ b/llvm/test/DebugInfo/X86/dbg-value-g-gmlt.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-dwarfdump - -debug-dump=info | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-dwarfdump - --debug-info | FileCheck %s ; ; IR module created as follows: ; clang -emit-llvm -S -O2 foo.cpp -o foo.ll -g diff --git a/llvm/test/DebugInfo/X86/dbg-value-inlined-parameter.ll b/llvm/test/DebugInfo/X86/dbg-value-inlined-parameter.ll index 0d842efdf42..ae7e1a1e5fc 100644 --- a/llvm/test/DebugInfo/X86/dbg-value-inlined-parameter.ll +++ b/llvm/test/DebugInfo/X86/dbg-value-inlined-parameter.ll @@ -1,9 +1,9 @@ ; RUN: llc -mtriple=x86_64-apple-darwin < %s -filetype=obj \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck --check-prefix=CHECK --check-prefix=DARWIN %s +; RUN: | llvm-dwarfdump -debug-info - | FileCheck --check-prefix=CHECK --check-prefix=DARWIN %s ; RUN: llc -mtriple=x86_64-linux-gnu < %s -filetype=obj \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck --check-prefix=CHECK --check-prefix=LINUX %s +; RUN: | llvm-dwarfdump -debug-info - | FileCheck --check-prefix=CHECK --check-prefix=LINUX %s ; RUN: llc -mtriple=x86_64-apple-darwin < %s -filetype=obj -regalloc=basic \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck --check-prefix=CHECK --check-prefix=DARWIN %s +; RUN: | llvm-dwarfdump -debug-info - | FileCheck --check-prefix=CHECK --check-prefix=DARWIN %s ; CHECK: DW_TAG_subprogram ; CHECK: DW_AT_abstract_origin {{.*}} "foo" diff --git a/llvm/test/DebugInfo/X86/dbg-value-location.ll b/llvm/test/DebugInfo/X86/dbg-value-location.ll index 2804fc9b8ff..f132beb9049 100644 --- a/llvm/test/DebugInfo/X86/dbg-value-location.ll +++ b/llvm/test/DebugInfo/X86/dbg-value-location.ll @@ -1,5 +1,5 @@ -; RUN: llc -filetype=obj %s -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s -; RUN: llc -filetype=obj %s -regalloc=basic -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -filetype=obj %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s +; RUN: llc -filetype=obj %s -regalloc=basic -o - | llvm-dwarfdump -debug-info - | FileCheck %s target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" target triple = "x86_64-apple-darwin10.0.0" ; Test that the type for the formal parameter "var" makes it into the debug info. diff --git a/llvm/test/DebugInfo/X86/debug-info-access.ll b/llvm/test/DebugInfo/X86/debug-info-access.ll index f068d41595a..a9e376c3818 100644 --- a/llvm/test/DebugInfo/X86/debug-info-access.ll +++ b/llvm/test/DebugInfo/X86/debug-info-access.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; ; Test the DW_AT_accessibility DWARF attribute. ; diff --git a/llvm/test/DebugInfo/X86/debug-info-blocks.ll b/llvm/test/DebugInfo/X86/debug-info-blocks.ll index c19728b5bfe..b6e5f1567ae 100644 --- a/llvm/test/DebugInfo/X86/debug-info-blocks.ll +++ b/llvm/test/DebugInfo/X86/debug-info-blocks.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple x86_64-apple-darwin -filetype=obj -o %t.o < %s -; RUN: llvm-dwarfdump -debug-dump=info %t.o | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t.o | FileCheck %s ; Generated from llvm/tools/clang/test/CodeGenObjC/debug-info-blocks.m ; rdar://problem/9279956 diff --git a/llvm/test/DebugInfo/X86/debug-info-packed-struct.ll b/llvm/test/DebugInfo/X86/debug-info-packed-struct.ll index f4ee500353e..cc445ed96a4 100644 --- a/llvm/test/DebugInfo/X86/debug-info-packed-struct.ll +++ b/llvm/test/DebugInfo/X86/debug-info-packed-struct.ll @@ -4,7 +4,7 @@ source_filename = "test/DebugInfo/X86/debug-info-packed-struct.ll" target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-darwin" ; RUN: %llc_dwarf -O0 -filetype=obj -o %t.o %s -; RUN: llvm-dwarfdump -debug-dump=info %t.o | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t.o | FileCheck %s ; REQUIRES: object-emission ; // --------------------------------------------------------------------- diff --git a/llvm/test/DebugInfo/X86/debug-info-producer-with-flags.ll b/llvm/test/DebugInfo/X86/debug-info-producer-with-flags.ll index c004c8a9067..f0fd9980226 100644 --- a/llvm/test/DebugInfo/X86/debug-info-producer-with-flags.ll +++ b/llvm/test/DebugInfo/X86/debug-info-producer-with-flags.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-unknown-linux-gnu %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; ; Test the DW_AT_producer DWARG attribute. ; When producer and flags are both given in DIComileUnit, set DW_AT_producer diff --git a/llvm/test/DebugInfo/X86/debug-info-static-member.ll b/llvm/test/DebugInfo/X86/debug-info-static-member.ll index 81f6b0a924c..7d536d2cb5b 100644 --- a/llvm/test/DebugInfo/X86/debug-info-static-member.ll +++ b/llvm/test/DebugInfo/X86/debug-info-static-member.ll @@ -1,9 +1,9 @@ ; RUN: llc %s -o %t -filetype=obj -O0 -mtriple=x86_64-unknown-linux-gnu -dwarf-version=4 -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s -check-prefix=PRESENT -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s -check-prefix=ABSENT +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s -check-prefix=PRESENT +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s -check-prefix=ABSENT ; RUN: llc %s -o %t -filetype=obj -O0 -mtriple=x86_64-apple-darwin -dwarf-version=4 -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s -check-prefix=DARWINP -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s -check-prefix=DARWINA +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s -check-prefix=DARWINP +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s -check-prefix=DARWINA ; Verify that attributes we do want are PRESENT; ; verify that attributes we don't want are ABSENT. ; It's a lot easier to do this in two passes than in one. diff --git a/llvm/test/DebugInfo/X86/debug-loc-asan.ll b/llvm/test/DebugInfo/X86/debug-loc-asan.ll index 8bb4644d5fe..f6d1939d6fb 100644 --- a/llvm/test/DebugInfo/X86/debug-loc-asan.ll +++ b/llvm/test/DebugInfo/X86/debug-loc-asan.ll @@ -1,6 +1,6 @@ ; RUN: llc -O0 -mtriple=x86_64-unknown-linux-gnu < %s | FileCheck %s ; RUN: llc -O0 -mtriple=x86_64-unknown-linux-gnu -filetype=obj < %s \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck %s --check-prefix=DWARF +; RUN: | llvm-dwarfdump -debug-info - | FileCheck %s --check-prefix=DWARF ; Verify that we have correct debug info for local variables in code ; instrumented with AddressSanitizer. diff --git a/llvm/test/DebugInfo/X86/default-subrange-array.ll b/llvm/test/DebugInfo/X86/default-subrange-array.ll index 83b4a8ad879..3dc2c562932 100644 --- a/llvm/test/DebugInfo/X86/default-subrange-array.ll +++ b/llvm/test/DebugInfo/X86/default-subrange-array.ll @@ -1,8 +1,8 @@ ; RUN: llc -mtriple=x86_64-apple-darwin -O0 -filetype=obj -dwarf-version 4 \ -; RUN: -o - < %s | llvm-dwarfdump - -debug-dump=info \ +; RUN: -o - < %s | llvm-dwarfdump - --debug-info \ ; RUN: | FileCheck %s -check-prefixes=CHECK,DWARF4 ; RUN: llc -mtriple=x86_64-apple-darwin -O0 -filetype=obj -dwarf-version 5 \ -; RUN: -o - < %s | llvm-dwarfdump - -debug-dump=info \ +; RUN: -o - < %s | llvm-dwarfdump - --debug-info \ ; RUN: | FileCheck %s -check-prefixes=CHECK,DWARF5 ; Check that we can omit default array lower-bounds. diff --git a/llvm/test/DebugInfo/X86/discriminator.ll b/llvm/test/DebugInfo/X86/discriminator.ll index a040137adec..bcb47f9bca9 100644 --- a/llvm/test/DebugInfo/X86/discriminator.ll +++ b/llvm/test/DebugInfo/X86/discriminator.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=i386-unknown-unknown -mcpu=core2 %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s ; ; Generated from: ; diff --git a/llvm/test/DebugInfo/X86/discriminator2.ll b/llvm/test/DebugInfo/X86/discriminator2.ll index 208fa241d40..b860bd482c4 100644 --- a/llvm/test/DebugInfo/X86/discriminator2.ll +++ b/llvm/test/DebugInfo/X86/discriminator2.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=i386-unknown-unknown -mcpu=core2 %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s ; ; Generated from: ; diff --git a/llvm/test/DebugInfo/X86/discriminator3.ll b/llvm/test/DebugInfo/X86/discriminator3.ll index e7dd116cb0d..f8b2c9c5156 100644 --- a/llvm/test/DebugInfo/X86/discriminator3.ll +++ b/llvm/test/DebugInfo/X86/discriminator3.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=i386-unknown-unknown -mcpu=core2 %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s ; ; Generated from: ; diff --git a/llvm/test/DebugInfo/X86/dllimport.ll b/llvm/test/DebugInfo/X86/dllimport.ll index 12ea8a8b447..88d1e0a24ea 100644 --- a/llvm/test/DebugInfo/X86/dllimport.ll +++ b/llvm/test/DebugInfo/X86/dllimport.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=i686-pc-windows-msvc -O0 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -mtriple=i686-pc-windows-msvc -O0 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; CHECK-NOT: DW_AT_location diff --git a/llvm/test/DebugInfo/X86/double-declare.ll b/llvm/test/DebugInfo/X86/double-declare.ll index 8ed4319b323..65998b5f37f 100644 --- a/llvm/test/DebugInfo/X86/double-declare.ll +++ b/llvm/test/DebugInfo/X86/double-declare.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=x86_64-apple-darwin -O0 -filetype=obj -o - < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -mtriple=x86_64-apple-darwin -O0 -filetype=obj -o - < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; PR33157. Don't crash on duplicate dbg.declare. ; CHECK: DW_TAG_formal_parameter ; CHECK: DW_AT_location [DW_FORM_exprloc] diff --git a/llvm/test/DebugInfo/X86/dwarf-public-names.ll b/llvm/test/DebugInfo/X86/dwarf-public-names.ll index af9b27d2107..01aa79b2fc9 100644 --- a/llvm/test/DebugInfo/X86/dwarf-public-names.ll +++ b/llvm/test/DebugInfo/X86/dwarf-public-names.ll @@ -1,9 +1,9 @@ ; RUN: llc -mtriple=x86_64-pc-linux-gnu -filetype=obj -o %t.o < %s -; RUN: llvm-dwarfdump -debug-dump=pubnames %t.o | FileCheck --check-prefix=LINUX %s +; RUN: llvm-dwarfdump -debug-pubnames %t.o | FileCheck --check-prefix=LINUX %s ; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj -o %t.o < %s -; RUN: llvm-dwarfdump -debug-dump=pubnames %t.o | FileCheck --check-prefix=NOPUB %s +; RUN: llvm-dwarfdump -debug-pubnames %t.o | FileCheck --check-prefix=NOPUB %s ; RUN: llc -mtriple=x86_64-scei-ps4 -filetype=obj -o %t.o < %s -; RUN: llvm-dwarfdump -debug-dump=pubnames %t.o | FileCheck --check-prefix=NOPUB %s +; RUN: llvm-dwarfdump -debug-pubnames %t.o | FileCheck --check-prefix=NOPUB %s ; ModuleID = 'dwarf-public-names.cpp' ; ; Generated from: diff --git a/llvm/test/DebugInfo/X86/elf-names.ll b/llvm/test/DebugInfo/X86/elf-names.ll index 602ef4581ea..80a83db09c4 100644 --- a/llvm/test/DebugInfo/X86/elf-names.ll +++ b/llvm/test/DebugInfo/X86/elf-names.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-unknown-linux-gnu %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; RUN: llvm-as < %s | llvm-dis | FileCheck --check-prefix=CHECK-DIS %s ; CHECK: 0x0000000b: DW_TAG_compile_unit diff --git a/llvm/test/DebugInfo/X86/empty-and-one-elem-array.ll b/llvm/test/DebugInfo/X86/empty-and-one-elem-array.ll index d844718f313..cdf746cee76 100644 --- a/llvm/test/DebugInfo/X86/empty-and-one-elem-array.ll +++ b/llvm/test/DebugInfo/X86/empty-and-one-elem-array.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin -O0 -filetype=obj -o %t < %s -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; <rdar://problem/12566646> %struct.foo = type { i32, [1 x i32] } diff --git a/llvm/test/DebugInfo/X86/empty-array.ll b/llvm/test/DebugInfo/X86/empty-array.ll index 4d9c34fe1a4..933536377ff 100644 --- a/llvm/test/DebugInfo/X86/empty-array.ll +++ b/llvm/test/DebugInfo/X86/empty-array.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin -O0 -filetype=obj -o %t < %s -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; <rdar://problem/12566646> source_filename = "test/DebugInfo/X86/empty-array.ll" diff --git a/llvm/test/DebugInfo/X86/ending-run.ll b/llvm/test/DebugInfo/X86/ending-run.ll index 88826e0b06b..aeadccfcca5 100644 --- a/llvm/test/DebugInfo/X86/ending-run.ll +++ b/llvm/test/DebugInfo/X86/ending-run.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin -filetype=obj %s -o %t -; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s ; Check that the line table starts at 7, not 4, but that the first ; statement isn't until line 8. diff --git a/llvm/test/DebugInfo/X86/enum-class.ll b/llvm/test/DebugInfo/X86/enum-class.ll index 299050104b9..0fb907c0b14 100644 --- a/llvm/test/DebugInfo/X86/enum-class.ll +++ b/llvm/test/DebugInfo/X86/enum-class.ll @@ -1,5 +1,5 @@ ; RUN: llc -O0 -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s source_filename = "test/DebugInfo/X86/enum-class.ll" diff --git a/llvm/test/DebugInfo/X86/enum-fwd-decl.ll b/llvm/test/DebugInfo/X86/enum-fwd-decl.ll index 86575aba95f..59de9b911c5 100644 --- a/llvm/test/DebugInfo/X86/enum-fwd-decl.ll +++ b/llvm/test/DebugInfo/X86/enum-fwd-decl.ll @@ -1,5 +1,5 @@ ; RUN: llc -O0 -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s source_filename = "test/DebugInfo/X86/enum-fwd-decl.ll" diff --git a/llvm/test/DebugInfo/X86/fi-expr.ll b/llvm/test/DebugInfo/X86/fi-expr.ll index 903cb56c674..f7ff452e0a3 100644 --- a/llvm/test/DebugInfo/X86/fi-expr.ll +++ b/llvm/test/DebugInfo/X86/fi-expr.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin -o - %s -filetype=obj \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: | llvm-dwarfdump -debug-info - | FileCheck %s ; A hand-crafted FrameIndex location with a DW_OP_deref. ; CHECK: DW_TAG_formal_parameter ; fbreg -8, deref diff --git a/llvm/test/DebugInfo/X86/fission-cu.ll b/llvm/test/DebugInfo/X86/fission-cu.ll index 17bf87a6211..0b5123e92b0 100644 --- a/llvm/test/DebugInfo/X86/fission-cu.ll +++ b/llvm/test/DebugInfo/X86/fission-cu.ll @@ -1,5 +1,5 @@ ; RUN: llc -split-dwarf-file=baz.dwo -O0 %s -mtriple=x86_64-unknown-linux-gnu -filetype=obj -o %t -; RUN: llvm-dwarfdump -debug-dump=all %t | FileCheck %s +; RUN: llvm-dwarfdump -all %t | FileCheck %s ; RUN: llvm-readobj --relocations %t | FileCheck --check-prefix=OBJ %s ; RUN: llvm-objdump -h %t | FileCheck --check-prefix=HDR %s diff --git a/llvm/test/DebugInfo/X86/fission-hash.ll b/llvm/test/DebugInfo/X86/fission-hash.ll index de9966ab0be..1330e66391e 100644 --- a/llvm/test/DebugInfo/X86/fission-hash.ll +++ b/llvm/test/DebugInfo/X86/fission-hash.ll @@ -1,5 +1,5 @@ ; RUN: llc -split-dwarf-file=foo.dwo -O0 %s -mtriple=x86_64-unknown-linux-gnu -filetype=obj -o %t -; RUN: llvm-dwarfdump -debug-dump=all %t | FileCheck %s +; RUN: llvm-dwarfdump -all %t | FileCheck %s ; The source is an empty file, modified to include/retain an 'int' type, since empty CUs are omitted. diff --git a/llvm/test/DebugInfo/X86/fission-inline.ll b/llvm/test/DebugInfo/X86/fission-inline.ll index eadcd15b2f2..a8434d6cef2 100644 --- a/llvm/test/DebugInfo/X86/fission-inline.ll +++ b/llvm/test/DebugInfo/X86/fission-inline.ll @@ -1,5 +1,5 @@ ; RUN: llc -split-dwarf-file=foo.dwo -O0 < %s -mtriple=x86_64-unknown-linux-gnu -filetype=obj > %t -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; RUN: llvm-objdump -r %t | FileCheck --check-prefix=RELOCS %s ; Test the emission of gmlt-like inlining information into the skeleton unit. diff --git a/llvm/test/DebugInfo/X86/fission-no-inlining.ll b/llvm/test/DebugInfo/X86/fission-no-inlining.ll index 5a80d61b5a4..a9ed56ac0f1 100644 --- a/llvm/test/DebugInfo/X86/fission-no-inlining.ll +++ b/llvm/test/DebugInfo/X86/fission-no-inlining.ll @@ -1,4 +1,4 @@ -; RUN: llc -split-dwarf-file=foo.dwo -O0 < %s -mtriple=x86_64-unknown-linux-gnu -filetype=obj | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -split-dwarf-file=foo.dwo -O0 < %s -mtriple=x86_64-unknown-linux-gnu -filetype=obj | llvm-dwarfdump -debug-info - | FileCheck %s ; CHECK-NOT: DW_TAG_subprogram diff --git a/llvm/test/DebugInfo/X86/float_const.ll b/llvm/test/DebugInfo/X86/float_const.ll index 8f1754ef4e4..a93a8f9ff06 100644 --- a/llvm/test/DebugInfo/X86/float_const.ll +++ b/llvm/test/DebugInfo/X86/float_const.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-dwarfdump -debug-info - | FileCheck %s ; from (at -Os): ; void foo() { ; float a = 3.14; diff --git a/llvm/test/DebugInfo/X86/formal_parameter.ll b/llvm/test/DebugInfo/X86/formal_parameter.ll index 470108616e8..cefb09c5865 100644 --- a/llvm/test/DebugInfo/X86/formal_parameter.ll +++ b/llvm/test/DebugInfo/X86/formal_parameter.ll @@ -14,7 +14,7 @@ target triple = "x86_64-apple-macosx10.9.0" ; ; RUN: opt %s -O2 -S -o %t ; RUN: cat %t | FileCheck --check-prefix=LOWERING %s -; RUN: llc -filetype=obj %t -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -filetype=obj %t -o - | llvm-dwarfdump -debug-info - | FileCheck %s ; Test that we only emit only one DW_AT_formal_parameter "map" for this function. ; rdar://problem/14874886 ; diff --git a/llvm/test/DebugInfo/X86/frame-register.ll b/llvm/test/DebugInfo/X86/frame-register.ll index cdd6ed33fa0..b32bf8f6ea5 100644 --- a/llvm/test/DebugInfo/X86/frame-register.ll +++ b/llvm/test/DebugInfo/X86/frame-register.ll @@ -1,4 +1,4 @@ -; RUN: llc %s -filetype=obj -o - | llvm-dwarfdump --debug-dump=info - | FileCheck %s +; RUN: llc %s -filetype=obj -o - | llvm-dwarfdump --debug-info - | FileCheck %s ; CHECK: DW_TAG_variable ; CHECK-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_fbreg +0) ; CHECK-NEXT: DW_AT_name {{.*}}"i" diff --git a/llvm/test/DebugInfo/X86/inline-member-function.ll b/llvm/test/DebugInfo/X86/inline-member-function.ll index cda3803f396..06fdac625ff 100644 --- a/llvm/test/DebugInfo/X86/inline-member-function.ll +++ b/llvm/test/DebugInfo/X86/inline-member-function.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: llc -mtriple=x86_64-linux -O0 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -mtriple=x86_64-linux -O0 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; From source: ; struct foo { diff --git a/llvm/test/DebugInfo/X86/inline-namespace.ll b/llvm/test/DebugInfo/X86/inline-namespace.ll index a1012a30e30..94f00f62df9 100644 --- a/llvm/test/DebugInfo/X86/inline-namespace.ll +++ b/llvm/test/DebugInfo/X86/inline-namespace.ll @@ -1,4 +1,4 @@ -; RUN: %llc_dwarf %s -o - -filetype=obj | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf %s -o - -filetype=obj | llvm-dwarfdump -debug-info - | FileCheck %s ; Generated from: ; namespace normal { inline namespace inlined { int i; } } ; Check that an inline namespace is emitted with DW_AT_export_symbols diff --git a/llvm/test/DebugInfo/X86/inline-seldag-test.ll b/llvm/test/DebugInfo/X86/inline-seldag-test.ll index ca4fab30aa2..85702950deb 100644 --- a/llvm/test/DebugInfo/X86/inline-seldag-test.ll +++ b/llvm/test/DebugInfo/X86/inline-seldag-test.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=x86_64-linux-gnu -fast-isel=false -filetype=obj < %s -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -mtriple=x86_64-linux-gnu -fast-isel=false -filetype=obj < %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s ; RUN: llc -mtriple=x86_64-linux-gnu -fast-isel=false -filetype=asm < %s -o - | FileCheck --check-prefix=ASM %s ; Generated from: diff --git a/llvm/test/DebugInfo/X86/lexical-block-file-inline.ll b/llvm/test/DebugInfo/X86/lexical-block-file-inline.ll index 9f040f41ec5..dde5548272d 100644 --- a/llvm/test/DebugInfo/X86/lexical-block-file-inline.ll +++ b/llvm/test/DebugInfo/X86/lexical-block-file-inline.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=x86_64-unknown-linux-gnu -filetype=obj -O0 < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -mtriple=x86_64-unknown-linux-gnu -filetype=obj -O0 < %s | llvm-dwarfdump -debug-info - | FileCheck %s ;; This test checks that Inlined DILexicalBlockFile with local decl entry ;; is skipped and only one DW_TAG_lexical_block is generated. diff --git a/llvm/test/DebugInfo/X86/lexical_block.ll b/llvm/test/DebugInfo/X86/lexical_block.ll index cf594d6b6ff..5cf2fdbace5 100644 --- a/llvm/test/DebugInfo/X86/lexical_block.ll +++ b/llvm/test/DebugInfo/X86/lexical_block.ll @@ -1,9 +1,9 @@ ; REQUIRES: object-emission ; RUN: llc -mtriple=x86_64-linux -O0 -filetype=obj < %s \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck --check-prefix=CHECK --check-prefix=CHECK-V4 %s +; RUN: | llvm-dwarfdump -debug-info - | FileCheck --check-prefix=CHECK --check-prefix=CHECK-V4 %s ; RUN: llc -mtriple=x86_64-linux -dwarf-version=3 -O0 -filetype=obj < %s \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck --check-prefix=CHECK --check-prefix=CHECK-V3 %s +; RUN: | llvm-dwarfdump -debug-info - | FileCheck --check-prefix=CHECK --check-prefix=CHECK-V3 %s ; Check that we emit DW_TAG_lexical_block and that it has the right encoding ; depending on the dwarf version. diff --git a/llvm/test/DebugInfo/X86/linkage-name.ll b/llvm/test/DebugInfo/X86/linkage-name.ll index 771ab740de5..194081a06a6 100644 --- a/llvm/test/DebugInfo/X86/linkage-name.ll +++ b/llvm/test/DebugInfo/X86/linkage-name.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-macosx %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; CHECK: DW_TAG_subprogram [9] * ; CHECK-NOT: DW_AT_{{(MIPS_)?}}linkage_name diff --git a/llvm/test/DebugInfo/X86/live-debug-variables.ll b/llvm/test/DebugInfo/X86/live-debug-variables.ll index 90d5b0b54d5..fbfd1d91a81 100644 --- a/llvm/test/DebugInfo/X86/live-debug-variables.ll +++ b/llvm/test/DebugInfo/X86/live-debug-variables.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=x86_64-linux-gnu -filetype=obj -o - %s | llvm-dwarfdump -debug-dump=loc - | FileCheck %s +; RUN: llc -mtriple=x86_64-linux-gnu -filetype=obj -o - %s | llvm-dwarfdump -debug-loc - | FileCheck %s ; The test inlines the function F four times, with each inlined variable for ; "i4" sharing the same virtual register. This means the live interval of the diff --git a/llvm/test/DebugInfo/X86/low-pc-cu.ll b/llvm/test/DebugInfo/X86/low-pc-cu.ll index 984bb096f07..98ea536fc28 100644 --- a/llvm/test/DebugInfo/X86/low-pc-cu.ll +++ b/llvm/test/DebugInfo/X86/low-pc-cu.ll @@ -1,7 +1,7 @@ ; RUN: llc -mtriple=x86_64-apple-darwin -filetype=obj < %s \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-V4 +; RUN: | llvm-dwarfdump -debug-info - | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-V4 ; RUN: llc -mtriple=x86_64-apple-darwin -filetype=obj -dwarf-version=3 < %s \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-V3 +; RUN: | llvm-dwarfdump -debug-info - | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-V3 ; Check that we use DW_AT_low_pc and that it has the right encoding depending diff --git a/llvm/test/DebugInfo/X86/main-file-name.s b/llvm/test/DebugInfo/X86/main-file-name.s index 0369c6158a4..d45b1751a5a 100644 --- a/llvm/test/DebugInfo/X86/main-file-name.s +++ b/llvm/test/DebugInfo/X86/main-file-name.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -triple x86_64-unknown-linux-gnu -filetype obj -main-file-name foo.S -g -o %t %s -// RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +// RUN: llvm-dwarfdump -debug-info %t | FileCheck %s // CHECK: DW_TAG_compile_unit [1] // CHECK-NOT: DW_TAG_ diff --git a/llvm/test/DebugInfo/X86/memberfnptr.ll b/llvm/test/DebugInfo/X86/memberfnptr.ll index e6123228013..7353a222b92 100644 --- a/llvm/test/DebugInfo/X86/memberfnptr.ll +++ b/llvm/test/DebugInfo/X86/memberfnptr.ll @@ -4,7 +4,7 @@ ; ; void (A::*p)() = &A::foo; ; -; RUN: llc -filetype=obj -o - %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -filetype=obj -o - %s | llvm-dwarfdump -debug-info - | FileCheck %s ; Check that the member function pointer is emitted without a DW_AT_size attribute. ; CHECK: DW_TAG_ptr_to_member_type ; CHECK-NOT: DW_AT_{{.*}}size diff --git a/llvm/test/DebugInfo/X86/missing-file-line.ll b/llvm/test/DebugInfo/X86/missing-file-line.ll index 629124d6765..67125bdd048 100644 --- a/llvm/test/DebugInfo/X86/missing-file-line.ll +++ b/llvm/test/DebugInfo/X86/missing-file-line.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: llc -mtriple=x86_64-linux-gnu -filetype=obj %s -o - | llvm-dwarfdump -debug-dump=all - | FileCheck %s +; RUN: llc -mtriple=x86_64-linux-gnu -filetype=obj %s -o - | llvm-dwarfdump -all - | FileCheck %s ; Test that we accept and generate DWARF entities for DW_TAG_structure_type, ; DW_TAG_member and DW_TAG_typedef with no source location. These can come up diff --git a/llvm/test/DebugInfo/X86/mixed-nodebug-cu.ll b/llvm/test/DebugInfo/X86/mixed-nodebug-cu.ll index bd078b75d38..37d06181694 100644 --- a/llvm/test/DebugInfo/X86/mixed-nodebug-cu.ll +++ b/llvm/test/DebugInfo/X86/mixed-nodebug-cu.ll @@ -1,5 +1,5 @@ ; RUN: llc %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; CHECK: DW_TAG_compile_unit ; CHECK: DW_TAG_subprogram ; CHECK: DW_AT_name{{.*}}"f" diff --git a/llvm/test/DebugInfo/X86/nondefault-subrange-array.ll b/llvm/test/DebugInfo/X86/nondefault-subrange-array.ll index b4fff0afbca..2360b055c78 100644 --- a/llvm/test/DebugInfo/X86/nondefault-subrange-array.ll +++ b/llvm/test/DebugInfo/X86/nondefault-subrange-array.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin -O0 -filetype=obj -o %t < %s -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s source_filename = "test/DebugInfo/X86/nondefault-subrange-array.ll" diff --git a/llvm/test/DebugInfo/X86/nophysreg.ll b/llvm/test/DebugInfo/X86/nophysreg.ll index fec8b6965bd..0de7c4ee18d 100644 --- a/llvm/test/DebugInfo/X86/nophysreg.ll +++ b/llvm/test/DebugInfo/X86/nophysreg.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; ; PR22296: In this testcase the DBG_VALUE describing "p5" becomes unavailable ; because the register its address is in is clobbered and we (currently) aren't diff --git a/llvm/test/DebugInfo/X86/noreturn_c11.ll b/llvm/test/DebugInfo/X86/noreturn_c11.ll index 37f564bd37f..3232b431881 100644 --- a/llvm/test/DebugInfo/X86/noreturn_c11.ll +++ b/llvm/test/DebugInfo/X86/noreturn_c11.ll @@ -1,4 +1,4 @@ -; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; REQUIRES: object-emission ; Generated by clang -S -c -std=c++11 --emit-llvm -g from the following C11 source: diff --git a/llvm/test/DebugInfo/X86/noreturn_cpp11.ll b/llvm/test/DebugInfo/X86/noreturn_cpp11.ll index 9e95a87e937..39761657339 100644 --- a/llvm/test/DebugInfo/X86/noreturn_cpp11.ll +++ b/llvm/test/DebugInfo/X86/noreturn_cpp11.ll @@ -1,4 +1,4 @@ -; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; REQUIRES: object-emission ; Generated by clang++ -S -c -std=c++11 --emit-llvm -g from the following C++11 source: diff --git a/llvm/test/DebugInfo/X86/noreturn_objc.ll b/llvm/test/DebugInfo/X86/noreturn_objc.ll index e896620814b..5c3934bb043 100644 --- a/llvm/test/DebugInfo/X86/noreturn_objc.ll +++ b/llvm/test/DebugInfo/X86/noreturn_objc.ll @@ -1,4 +1,4 @@ -; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; REQUIRES: object-emission ; Generated by clang++ -S -c --emit-llvm -g from the following ObjC source: diff --git a/llvm/test/DebugInfo/X86/objc-fwd-decl.ll b/llvm/test/DebugInfo/X86/objc-fwd-decl.ll index 38acc129e2f..3c788cf7ddb 100644 --- a/llvm/test/DebugInfo/X86/objc-fwd-decl.ll +++ b/llvm/test/DebugInfo/X86/objc-fwd-decl.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-macosx %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; CHECK: DW_TAG_structure_type ; CHECK: DW_AT_declaration diff --git a/llvm/test/DebugInfo/X86/objc-property-void.ll b/llvm/test/DebugInfo/X86/objc-property-void.ll index 4fcc2429208..d0ded645374 100644 --- a/llvm/test/DebugInfo/X86/objc-property-void.ll +++ b/llvm/test/DebugInfo/X86/objc-property-void.ll @@ -1,5 +1,5 @@ ; RUN: llc -filetype=obj -o %t.o < %s >/dev/null 2>&1 -; RUN: llvm-dwarfdump -debug-dump=info %t.o | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t.o | FileCheck %s ; CHECK: DW_TAG_structure_type ; CHECK: DW_AT_APPLE_objc_complete_type diff --git a/llvm/test/DebugInfo/X86/op_deref.ll b/llvm/test/DebugInfo/X86/op_deref.ll index d9a019c4a5c..4ee258914a5 100644 --- a/llvm/test/DebugInfo/X86/op_deref.ll +++ b/llvm/test/DebugInfo/X86/op_deref.ll @@ -1,8 +1,8 @@ ; RUN: llc -O0 -mtriple=x86_64-apple-darwin < %s -filetype=obj \ -; RUN: | llvm-dwarfdump -debug-dump=info - \ +; RUN: | llvm-dwarfdump -debug-info - \ ; RUN: | FileCheck %s -check-prefix=CHECK -check-prefix=DWARF4 ; RUN: llc -O0 -mtriple=x86_64-apple-darwin < %s -filetype=obj -dwarf-version=3 \ -; RUN: | llvm-dwarfdump -debug-dump=info - \ +; RUN: | llvm-dwarfdump -debug-info - \ ; RUN: | FileCheck %s -check-prefix=CHECK -check-prefix=DWARF3 ; DWARF4: DW_AT_location [DW_FORM_sec_offset] (0x00000000 diff --git a/llvm/test/DebugInfo/X86/parameters.ll b/llvm/test/DebugInfo/X86/parameters.ll index 9983509a115..3046ce664ac 100644 --- a/llvm/test/DebugInfo/X86/parameters.ll +++ b/llvm/test/DebugInfo/X86/parameters.ll @@ -1,7 +1,7 @@ ; REQUIRES: object-emission ; ; RUN: llc -mtriple=x86_64-unknown-linux-gnu -O0 -filetype=obj < %s > %t -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; Test case derived from compiling the following source with clang -g: ; diff --git a/llvm/test/DebugInfo/X86/pieces-1.ll b/llvm/test/DebugInfo/X86/pieces-1.ll index 609f92df410..f961eb0d758 100644 --- a/llvm/test/DebugInfo/X86/pieces-1.ll +++ b/llvm/test/DebugInfo/X86/pieces-1.ll @@ -1,5 +1,5 @@ ; RUN: llc -O0 %s -filetype=obj -o %t.o -; RUN: llvm-dwarfdump -debug-dump=loc %t.o | FileCheck %s +; RUN: llvm-dwarfdump -debug-loc %t.o | FileCheck %s ; ; rdar://problem/15928306 ; diff --git a/llvm/test/DebugInfo/X86/pieces-4.ll b/llvm/test/DebugInfo/X86/pieces-4.ll index 860255d1fe0..495449c90e2 100644 --- a/llvm/test/DebugInfo/X86/pieces-4.ll +++ b/llvm/test/DebugInfo/X86/pieces-4.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s | FileCheck %s -; RUN: llc -filetype=obj < %s | llvm-dwarfdump -debug-dump=loc - | FileCheck %s --check-prefix=DWARF +; RUN: llc -filetype=obj < %s | llvm-dwarfdump -debug-loc - | FileCheck %s --check-prefix=DWARF ; Compile the following with -O1: diff --git a/llvm/test/DebugInfo/X86/pointer-type-size.ll b/llvm/test/DebugInfo/X86/pointer-type-size.ll index 085966d5955..144b82c3b7b 100644 --- a/llvm/test/DebugInfo/X86/pointer-type-size.ll +++ b/llvm/test/DebugInfo/X86/pointer-type-size.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-macosx10.7 %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; CHECK: ptr ; CHECK-NOT: AT_bit_size diff --git a/llvm/test/DebugInfo/X86/pr11300.ll b/llvm/test/DebugInfo/X86/pr11300.ll index c1536a458e3..1e2ac36a5e6 100644 --- a/llvm/test/DebugInfo/X86/pr11300.ll +++ b/llvm/test/DebugInfo/X86/pr11300.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; test that the DW_AT_specification is a back edge in the file. diff --git a/llvm/test/DebugInfo/X86/pr13303.ll b/llvm/test/DebugInfo/X86/pr13303.ll index 4d2ebf334a6..9e130a4a5c6 100644 --- a/llvm/test/DebugInfo/X86/pr13303.ll +++ b/llvm/test/DebugInfo/X86/pr13303.ll @@ -1,5 +1,5 @@ ; RUN: llc %s -o %t -filetype=obj -mtriple=x86_64-unknown-linux-gnu -; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s ; PR13303 ; Check that the prologue ends with is_stmt here. diff --git a/llvm/test/DebugInfo/X86/reference-argument.ll b/llvm/test/DebugInfo/X86/reference-argument.ll index 47cbd688a88..d96a79fee15 100644 --- a/llvm/test/DebugInfo/X86/reference-argument.ll +++ b/llvm/test/DebugInfo/X86/reference-argument.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-macosx10.9.0 -filetype=obj -O0 < %s \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: | llvm-dwarfdump -debug-info - | FileCheck %s ; ModuleID = 'aggregate-indirect-arg.cpp' ; extracted from debuginfo-tests/aggregate-indirect-arg.cpp diff --git a/llvm/test/DebugInfo/X86/rematerialize.ll b/llvm/test/DebugInfo/X86/rematerialize.ll index c43af6fd785..72e912f9a21 100644 --- a/llvm/test/DebugInfo/X86/rematerialize.ll +++ b/llvm/test/DebugInfo/X86/rematerialize.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission ; RUN: llc -O2 -filetype=obj -mtriple=x86_64-unknown-linux-gnu < %s \ -; RUN: | llvm-dwarfdump -debug-dump=line - | FileCheck %s +; RUN: | llvm-dwarfdump -debug-line - | FileCheck %s ; ; Generated with clang -O2 -g from ; diff --git a/llvm/test/DebugInfo/X86/rvalue-ref.ll b/llvm/test/DebugInfo/X86/rvalue-ref.ll index 91686e56ad2..5fe2f2e34e8 100644 --- a/llvm/test/DebugInfo/X86/rvalue-ref.ll +++ b/llvm/test/DebugInfo/X86/rvalue-ref.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj -O0 -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; CHECK: DW_TAG_rvalue_reference_type diff --git a/llvm/test/DebugInfo/X86/single-dbg_value.ll b/llvm/test/DebugInfo/X86/single-dbg_value.ll index 9757f537518..6e2292c0b17 100644 --- a/llvm/test/DebugInfo/X86/single-dbg_value.ll +++ b/llvm/test/DebugInfo/X86/single-dbg_value.ll @@ -1,7 +1,7 @@ ; RUN: %llc_dwarf -stop-after=livedebugvalues -o - %s \ ; RUN: | FileCheck %s --check-prefix=SANITY ; RUN: %llc_dwarf -march=x86-64 -o - %s -filetype=obj \ -; RUN: | llvm-dwarfdump -debug-dump=all - | FileCheck %s +; RUN: | llvm-dwarfdump -all - | FileCheck %s ; ; CHECK: .debug_info contents: ; CHECK: DW_TAG_variable diff --git a/llvm/test/DebugInfo/X86/single-fi.ll b/llvm/test/DebugInfo/X86/single-fi.ll index 69a7b358efb..098d1cd54fd 100644 --- a/llvm/test/DebugInfo/X86/single-fi.ll +++ b/llvm/test/DebugInfo/X86/single-fi.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin -o - %s -filetype=obj \ -; RUN: | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: | llvm-dwarfdump -debug-info - | FileCheck %s ; A single FI location. This used to trigger an assertion in debug libstdc++. ; CHECK: DW_TAG_formal_parameter ; fbreg -8 diff --git a/llvm/test/DebugInfo/X86/split-dwarf-cross-unit-reference.ll b/llvm/test/DebugInfo/X86/split-dwarf-cross-unit-reference.ll index ca8525cd335..c592c2e2ab5 100644 --- a/llvm/test/DebugInfo/X86/split-dwarf-cross-unit-reference.ll +++ b/llvm/test/DebugInfo/X86/split-dwarf-cross-unit-reference.ll @@ -1,12 +1,12 @@ ; RUN: llc -mtriple=x86_64-linux -split-dwarf-cross-cu-references -split-dwarf-file=foo.dwo -filetype=obj -o %t < %s ; RUN: llvm-objdump -r %t | FileCheck %s -; RUN: llvm-dwarfdump -debug-dump=info.dwo %t | FileCheck --check-prefix=ALL --check-prefix=INFO --check-prefix=DWO --check-prefix=CROSS %s -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck --check-prefix=ALL --check-prefix=INFO %s +; RUN: llvm-dwarfdump -debug-info-dwo %t | FileCheck --check-prefix=ALL --check-prefix=INFO --check-prefix=DWO --check-prefix=CROSS %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck --check-prefix=ALL --check-prefix=INFO %s ; RUN: llc -mtriple=x86_64-linux -split-dwarf-file=foo.dwo -filetype=obj -o %t < %s ; RUN: llvm-objdump -r %t | FileCheck %s -; RUN: llvm-dwarfdump -debug-dump=info.dwo %t | FileCheck --check-prefix=ALL --check-prefix=DWO --check-prefix=NOCROSS %s -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck --check-prefix=ALL --check-prefix=INFO %s +; RUN: llvm-dwarfdump -debug-info-dwo %t | FileCheck --check-prefix=ALL --check-prefix=DWO --check-prefix=NOCROSS %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck --check-prefix=ALL --check-prefix=INFO %s ; Testing cross-CU references for types, subprograms, and variables ; Built from code something like this: diff --git a/llvm/test/DebugInfo/X86/split-dwarf-multiple-cu-hash.ll b/llvm/test/DebugInfo/X86/split-dwarf-multiple-cu-hash.ll index 389571356d3..688ef8376c8 100644 --- a/llvm/test/DebugInfo/X86/split-dwarf-multiple-cu-hash.ll +++ b/llvm/test/DebugInfo/X86/split-dwarf-multiple-cu-hash.ll @@ -1,7 +1,7 @@ ; RUN: rm -rf %t && mkdir -p %t ; RUN: %llc_dwarf -split-dwarf-file=foo.dwo %s -filetype=obj -o %t/a.o ; RUN: %llc_dwarf -split-dwarf-file=bar.dwo %s -filetype=obj -o %t/b.o -; RUN: llvm-dwarfdump -debug-dump=info %t/a.o %t/b.o | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t/a.o %t/b.o | FileCheck %s ; CHECK: dwo_id {{.*}}([[HASH:.*]]) ; CHECK-NOT: dwo_id {{.*}}([[HASH]]) diff --git a/llvm/test/DebugInfo/X86/split-dwarf-omit-empty.ll b/llvm/test/DebugInfo/X86/split-dwarf-omit-empty.ll index 5f824bd43cd..4e8debb20a8 100644 --- a/llvm/test/DebugInfo/X86/split-dwarf-omit-empty.ll +++ b/llvm/test/DebugInfo/X86/split-dwarf-omit-empty.ll @@ -1,4 +1,4 @@ -; RUN: %llc_dwarf -split-dwarf-file=foo.dwo %s -filetype=obj -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf -split-dwarf-file=foo.dwo %s -filetype=obj -o - | llvm-dwarfdump -debug-info - | FileCheck %s ; Created from: ; a.cpp: diff --git a/llvm/test/DebugInfo/X86/split-global.ll b/llvm/test/DebugInfo/X86/split-global.ll index b2e72645b3b..99076cf648e 100644 --- a/llvm/test/DebugInfo/X86/split-global.ll +++ b/llvm/test/DebugInfo/X86/split-global.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o - -filetype=obj | \ -; RUN: llvm-dwarfdump --debug-dump=info - | FileCheck %s +; RUN: llvm-dwarfdump --debug-info - | FileCheck %s ; ; Test emitting debug info for fragmented global values. ; This is a handcrafted example of an SROAed global variable. diff --git a/llvm/test/DebugInfo/X86/sret.ll b/llvm/test/DebugInfo/X86/sret.ll index 96ed7a92a92..93d88d2cf8d 100644 --- a/llvm/test/DebugInfo/X86/sret.ll +++ b/llvm/test/DebugInfo/X86/sret.ll @@ -1,5 +1,5 @@ ; RUN: llc -split-dwarf-file=foo.dwo -O0 %s -mtriple=x86_64-unknown-linux-gnu -filetype=obj -o %t -; RUN: llvm-dwarfdump -debug-dump=all %t | FileCheck %s --check-prefix=CHECK-DWO +; RUN: llvm-dwarfdump -all %t | FileCheck %s --check-prefix=CHECK-DWO ; Based on the debuginfo-tests/sret.cpp code. diff --git a/llvm/test/DebugInfo/X86/stack-value-dwarf2.ll b/llvm/test/DebugInfo/X86/stack-value-dwarf2.ll index f7cc2518e65..c149a1d5d95 100644 --- a/llvm/test/DebugInfo/X86/stack-value-dwarf2.ll +++ b/llvm/test/DebugInfo/X86/stack-value-dwarf2.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj -o - %s | llvm-dwarfdump -debug-dump=loc - | FileCheck %s +; RUN: llc -filetype=obj -o - %s | llvm-dwarfdump -debug-loc - | FileCheck %s ; Note that it would be even better to avoid emitting the empty piece. ; CHECK: {{.*}}: DW_OP_piece 0x8{{$}} diff --git a/llvm/test/DebugInfo/X86/static_member_array.ll b/llvm/test/DebugInfo/X86/static_member_array.ll index a89408778ef..b35434fbc98 100644 --- a/llvm/test/DebugInfo/X86/static_member_array.ll +++ b/llvm/test/DebugInfo/X86/static_member_array.ll @@ -1,4 +1,4 @@ -; RUN: %llc_dwarf %s -filetype=obj -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: %llc_dwarf %s -filetype=obj -o - | llvm-dwarfdump -debug-info - | FileCheck %s ; Generated from: ; ; struct A { diff --git a/llvm/test/DebugInfo/X86/struct-loc.ll b/llvm/test/DebugInfo/X86/struct-loc.ll index c49336bd506..7511ac60528 100644 --- a/llvm/test/DebugInfo/X86/struct-loc.ll +++ b/llvm/test/DebugInfo/X86/struct-loc.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; Make sure that structures have a decl file and decl line attached. ; CHECK: DW_TAG_structure_type diff --git a/llvm/test/DebugInfo/X86/subrange-type.ll b/llvm/test/DebugInfo/X86/subrange-type.ll index cde894f765b..651cbf46a69 100644 --- a/llvm/test/DebugInfo/X86/subrange-type.ll +++ b/llvm/test/DebugInfo/X86/subrange-type.ll @@ -1,5 +1,5 @@ ; RUN: llc -O0 %s -mtriple=x86_64-unknown-linux-gnu -filetype=obj -o %t -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; Make sure that the base type from the subrange type has a name. ; CHECK: DW_TAG_subrange_type diff --git a/llvm/test/DebugInfo/X86/template.ll b/llvm/test/DebugInfo/X86/template.ll index 97b94832d15..8ba58d54fe6 100644 --- a/llvm/test/DebugInfo/X86/template.ll +++ b/llvm/test/DebugInfo/X86/template.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: llc -mtriple=x86_64-linux -O0 -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -mtriple=x86_64-linux -O0 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; IR generated with `clang++ -g -emit-llvm -S` from the following code: ; template<int x, int*, template<typename> class y, decltype(nullptr) n, int ...z> int func() { return 3; } diff --git a/llvm/test/DebugInfo/X86/this-stack_value.ll b/llvm/test/DebugInfo/X86/this-stack_value.ll index 92db39339a4..69461392565 100644 --- a/llvm/test/DebugInfo/X86/this-stack_value.ll +++ b/llvm/test/DebugInfo/X86/this-stack_value.ll @@ -1,5 +1,5 @@ ; RUN: llc -filetype=asm -o - %s | FileCheck %s --check-prefix=ASM -; RUN: llc -filetype=obj -o - %s | llvm-dwarfdump --debug-dump=info - | FileCheck %s +; RUN: llc -filetype=obj -o - %s | llvm-dwarfdump --debug-info - | FileCheck %s ; ; Generated at -O2 from: ; struct B; diff --git a/llvm/test/DebugInfo/X86/union-const.ll b/llvm/test/DebugInfo/X86/union-const.ll index 91b4bb7fa80..04f49a332ef 100644 --- a/llvm/test/DebugInfo/X86/union-const.ll +++ b/llvm/test/DebugInfo/X86/union-const.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj < %s | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llc -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s ; CHECK: DW_TAG_variable ; CHECK-NEXT: DW_AT_const_value [DW_FORM_udata] (0) ; CHECK-NEXT: DW_AT_name {{.*}}"a" diff --git a/llvm/test/DebugInfo/X86/union-template.ll b/llvm/test/DebugInfo/X86/union-template.ll index e30ef5f3fd5..7c15bbb3dfe 100644 --- a/llvm/test/DebugInfo/X86/union-template.ll +++ b/llvm/test/DebugInfo/X86/union-template.ll @@ -1,5 +1,5 @@ ; RUN: llc -O0 -mtriple=x86_64-linux-gnu %s -o %t -filetype=obj -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; Verify that we've emitted template arguments for the union ; CHECK: DW_TAG_union_type diff --git a/llvm/test/DebugInfo/X86/vector.ll b/llvm/test/DebugInfo/X86/vector.ll index 76c3a2beabb..87b7215d04b 100644 --- a/llvm/test/DebugInfo/X86/vector.ll +++ b/llvm/test/DebugInfo/X86/vector.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-linux-gnu -O0 -filetype=obj -o %t %s -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; Generated from: ; clang -g -S -emit-llvm -o foo.ll foo.c diff --git a/llvm/test/DebugInfo/debugmacinfo.test b/llvm/test/DebugInfo/debugmacinfo.test index b8dd56a22bd..fab4ca22527 100644 --- a/llvm/test/DebugInfo/debugmacinfo.test +++ b/llvm/test/DebugInfo/debugmacinfo.test @@ -1,6 +1,6 @@ -RUN: llvm-dwarfdump -debug-dump=macro %p/Inputs/dwarfdump-macro.o \ +RUN: llvm-dwarfdump -debug-macro %p/Inputs/dwarfdump-macro.o \ RUN: | FileCheck %s -check-prefix TEST_MACINFO -RUN: llvm-dwarfdump -debug-dump=line %p/Inputs/dwarfdump-macro.o \ +RUN: llvm-dwarfdump -debug-line %p/Inputs/dwarfdump-macro.o \ RUN: | FileCheck %s -check-prefix TEST_LINE diff --git a/llvm/test/DebugInfo/dwarfdump-64-bit-dwarf.test b/llvm/test/DebugInfo/dwarfdump-64-bit-dwarf.test index 0a24414c27b..702da150548 100644 --- a/llvm/test/DebugInfo/dwarfdump-64-bit-dwarf.test +++ b/llvm/test/DebugInfo/dwarfdump-64-bit-dwarf.test @@ -1,5 +1,5 @@ RUN: llvm-dwarfdump %p/Inputs/dwarfdump.elf-mips64-64-bit-dwarf \ -RUN: --debug-dump=line | FileCheck %s +RUN: ---debug-line | FileCheck %s # FIXME: llvm-dwarfdump's support for 64-bit dwarf is currently limited to # .debug_line. diff --git a/llvm/test/DebugInfo/dwarfdump-debug-frame-simple.test b/llvm/test/DebugInfo/dwarfdump-debug-frame-simple.test index b1a58e6ec2a..6d0987bece5 100644 --- a/llvm/test/DebugInfo/dwarfdump-debug-frame-simple.test +++ b/llvm/test/DebugInfo/dwarfdump-debug-frame-simple.test @@ -1,4 +1,4 @@ -; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test-32bit.elf.o -debug-dump=frames | FileCheck %s -check-prefix FRAMES +; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test-32bit.elf.o --debug-frames | FileCheck %s -check-prefix FRAMES ; Note: the input file was generated from Inputs/dwarfdump-test-32bit.elf.c ; FRAMES: .debug_frame diff --git a/llvm/test/DebugInfo/dwarfdump-dump-flags.test b/llvm/test/DebugInfo/dwarfdump-dump-flags.test index 4c10bede6f8..513650abe3b 100644 --- a/llvm/test/DebugInfo/dwarfdump-dump-flags.test +++ b/llvm/test/DebugInfo/dwarfdump-dump-flags.test @@ -1,9 +1,9 @@ -; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test.elf-x86-64 -debug-dump=all | FileCheck %s -check-prefix DUMP_ALL -; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test.elf-x86-64 -debug-dump=info | FileCheck %s -check-prefix DUMP_INFO -; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test.elf-x86-64 -debug-dump=ranges | FileCheck %s -check-prefix DUMP_RANGES -; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test.macho-i386.o -debug-dump=all | FileCheck %s -check-prefix DUMP_ALL -; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test.macho-i386.o -debug-dump=info | FileCheck %s -check-prefix DUMP_INFO -; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test.macho-i386.o -debug-dump=ranges | FileCheck %s -check-prefix DUMP_RANGES +; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test.elf-x86-64 --all | FileCheck %s -check-prefix DUMP_ALL +; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test.elf-x86-64 --debug-info | FileCheck %s -check-prefix DUMP_INFO +; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test.elf-x86-64 --debug-ranges | FileCheck %s -check-prefix DUMP_RANGES +; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test.macho-i386.o -all | FileCheck %s -check-prefix DUMP_ALL +; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test.macho-i386.o --debug-info | FileCheck %s -check-prefix DUMP_INFO +; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test.macho-i386.o --debug-ranges | FileCheck %s -check-prefix DUMP_RANGES ; DUMP_ALL: .debug_info ; DUMP_ALL: .debug_ranges diff --git a/llvm/test/DebugInfo/dwarfdump-dump-gdbindex.test b/llvm/test/DebugInfo/dwarfdump-dump-gdbindex.test index 6f1ef7cda3d..cd5cd132d5d 100644 --- a/llvm/test/DebugInfo/dwarfdump-dump-gdbindex.test +++ b/llvm/test/DebugInfo/dwarfdump-dump-gdbindex.test @@ -1,4 +1,4 @@ -RUN: llvm-dwarfdump -debug-dump=gdb_index %p/Inputs/dwarfdump-gdbindex-v7.elf-x86-64 | FileCheck %s +RUN: llvm-dwarfdump -gdb-index %p/Inputs/dwarfdump-gdbindex-v7.elf-x86-64 | FileCheck %s ; test.cpp: ; int main() { return 0; } diff --git a/llvm/test/DebugInfo/dwarfdump-implicit-const.test b/llvm/test/DebugInfo/dwarfdump-implicit-const.test index 5458ada1a17..c6fa18343be 100644 --- a/llvm/test/DebugInfo/dwarfdump-implicit-const.test +++ b/llvm/test/DebugInfo/dwarfdump-implicit-const.test @@ -1,2 +1,2 @@ -RUN: llvm-dwarfdump -debug-dump=abbrev %p/Inputs/implicit-const-test.o | FileCheck %s +RUN: llvm-dwarfdump -debug-abbrev %p/Inputs/implicit-const-test.o | FileCheck %s CHECK: DW_FORM_implicit_const -9223372036854775808 diff --git a/llvm/test/DebugInfo/dwarfdump-macho-relocs.test b/llvm/test/DebugInfo/dwarfdump-macho-relocs.test index 95798a841ca..801d8304b8a 100644 --- a/llvm/test/DebugInfo/dwarfdump-macho-relocs.test +++ b/llvm/test/DebugInfo/dwarfdump-macho-relocs.test @@ -1,4 +1,4 @@ -// RUN: llvm-dwarfdump -debug-dump=info %p/Inputs/dwarfdump-macho-relocs.macho.x86_64.o | FileCheck %s +// RUN: llvm-dwarfdump -debug-info %p/Inputs/dwarfdump-macho-relocs.macho.x86_64.o | FileCheck %s // The dumped file has 2 functions in different sections of the __TEXT segment. // Check that the addresses are are dumped correctly diff --git a/llvm/test/DebugInfo/dwarfdump-macho-universal.test b/llvm/test/DebugInfo/dwarfdump-macho-universal.test index 0b4777317d7..85d04b23078 100644 --- a/llvm/test/DebugInfo/dwarfdump-macho-universal.test +++ b/llvm/test/DebugInfo/dwarfdump-macho-universal.test @@ -1,5 +1,5 @@ Reuse a test input from llvm-dsymutil, it's perfect for what we want to exercise -RUN: llvm-dwarfdump %S/Inputs/fat-test.o -debug-dump=info | FileCheck %s +RUN: llvm-dwarfdump %S/Inputs/fat-test.o --debug-info | FileCheck %s CHECK: fat-test.o (x86_64): file format Mach-O 64-bit x86-64 CHECK: DW_TAG_variable diff --git a/llvm/test/DebugInfo/dwarfdump-pubnames.test b/llvm/test/DebugInfo/dwarfdump-pubnames.test index 215953abe7f..558ba658925 100644 --- a/llvm/test/DebugInfo/dwarfdump-pubnames.test +++ b/llvm/test/DebugInfo/dwarfdump-pubnames.test @@ -1,5 +1,5 @@ RUN: llvm-dwarfdump %p/Inputs/dwarfdump-pubnames.elf-x86-64 \ -RUN: -debug-dump=pubnames | FileCheck %s +RUN: --debug-pubnames | FileCheck %s CHECK: .debug_pubnames contents: CHECK: length = 0x000000a1 version = 0x0002 unit_offset = 0x00000000 unit_size = 0x00000141 diff --git a/llvm/test/DebugInfo/dwarfdump-type-units.test b/llvm/test/DebugInfo/dwarfdump-type-units.test index ddcbf5e1756..087af342758 100644 --- a/llvm/test/DebugInfo/dwarfdump-type-units.test +++ b/llvm/test/DebugInfo/dwarfdump-type-units.test @@ -1,6 +1,6 @@ RUN: llvm-dwarfdump %p/Inputs/dwarfdump-type-units.elf-x86-64 | FileCheck -check-prefix=CHECK -check-prefix=LONG %s RUN: llvm-dwarfdump %p/Inputs/dwarfdump-type-units.elf-x86-64 -summarize-types | FileCheck -check-prefix=CHECK -check-prefix=SHORT %s -RUN: llvm-dwarfdump -debug-dump=types %p/Inputs/dwarfdump-type-units.elf-x86-64 | FileCheck -check-prefix=TYPES %s +RUN: llvm-dwarfdump -debug-types %p/Inputs/dwarfdump-type-units.elf-x86-64 | FileCheck -check-prefix=TYPES %s CHECK: debug_info contents: diff --git a/llvm/test/DebugInfo/dwo.ll b/llvm/test/DebugInfo/dwo.ll index 7b02c3c88b7..662fd2dae93 100644 --- a/llvm/test/DebugInfo/dwo.ll +++ b/llvm/test/DebugInfo/dwo.ll @@ -1,5 +1,5 @@ ; RUN: %llc_dwarf %s -filetype=obj -o %t -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; REQUIRES: default_triple ; ; CHECK: DW_TAG_compile_unit diff --git a/llvm/test/DebugInfo/skeletoncu.ll b/llvm/test/DebugInfo/skeletoncu.ll index a90c8b355ce..d018abac46c 100644 --- a/llvm/test/DebugInfo/skeletoncu.ll +++ b/llvm/test/DebugInfo/skeletoncu.ll @@ -1,5 +1,5 @@ ; RUN: %llc_dwarf %s -filetype=obj -o %t -; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s ; CHECK: DW_TAG_compile_unit ; CHECK: DW_AT_GNU_dwo_id {{.*}}abcd ; CHECK: DW_AT_GNU_dwo_name {{.*}}"my.dwo" diff --git a/llvm/test/Linker/subprogram-linkonce-weak.ll b/llvm/test/Linker/subprogram-linkonce-weak.ll index ab01c05dd37..955955043ff 100644 --- a/llvm/test/Linker/subprogram-linkonce-weak.ll +++ b/llvm/test/Linker/subprogram-linkonce-weak.ll @@ -85,9 +85,9 @@ entry: ; Crasher for llc. ; REQUIRES: object-emission ; RUN: %llc_dwarf -filetype=obj -O0 %t1 -o %t1.o -; RUN: llvm-dwarfdump %t1.o -debug-dump=all | FileCheck %s -check-prefix=DWLW -check-prefix=DW +; RUN: llvm-dwarfdump %t1.o --all | FileCheck %s -check-prefix=DWLW -check-prefix=DW ; RUN: %llc_dwarf -filetype=obj -O0 %t2 -o %t2.o -; RUN: llvm-dwarfdump %t2.o -debug-dump=all | FileCheck %s -check-prefix=DWWL -check-prefix=DW +; RUN: llvm-dwarfdump %t2.o --all | FileCheck %s -check-prefix=DWWL -check-prefix=DW ; Check that the debug info for the discarded linkonce version of @foo doesn't ; reference any code, and that the other subprograms look correct. diff --git a/llvm/test/Linker/type-unique-odr-a.ll b/llvm/test/Linker/type-unique-odr-a.ll index 7a3b88a2c2c..257c838c6b8 100644 --- a/llvm/test/Linker/type-unique-odr-a.ll +++ b/llvm/test/Linker/type-unique-odr-a.ll @@ -2,11 +2,11 @@ ; ; RUN: llvm-link %s %p/type-unique-odr-b.ll -S -o - \ ; RUN: | %llc_dwarf -dwarf-linkage-names=All -filetype=obj -O0 \ -; RUN: | llvm-dwarfdump -debug-dump=info - \ +; RUN: | llvm-dwarfdump -debug-info - \ ; RUN: | FileCheck %s ; RUN: llvm-link %p/type-unique-odr-b.ll %s -S -o - \ ; RUN: | %llc_dwarf -dwarf-linkage-names=All -filetype=obj -O0 \ -; RUN: | llvm-dwarfdump -debug-dump=info - \ +; RUN: | llvm-dwarfdump -debug-info - \ ; RUN: | FileCheck %s ; ; Test ODR-based type uniquing for C++ class members. diff --git a/llvm/test/Linker/type-unique-simple-a.ll b/llvm/test/Linker/type-unique-simple-a.ll index 2ec7eb3bb4c..6cfc8e33f80 100644 --- a/llvm/test/Linker/type-unique-simple-a.ll +++ b/llvm/test/Linker/type-unique-simple-a.ll @@ -3,7 +3,7 @@ ; RUN: llvm-link %s %p/type-unique-simple-b.ll -S -o %t ; RUN: cat %t | FileCheck %s -check-prefix=LINK ; RUN: %llc_dwarf -filetype=obj -O0 < %t > %t2 -; RUN: llvm-dwarfdump -debug-dump=info %t2 | FileCheck %s +; RUN: llvm-dwarfdump -debug-info %t2 | FileCheck %s ; Make sure the backend generates a single DIE and uses ref_addr. ; CHECK: 0x[[BASE:.*]]: DW_TAG_structure_type diff --git a/llvm/test/Linker/type-unique-simple2-a.ll b/llvm/test/Linker/type-unique-simple2-a.ll index 792a820f03e..be18d21a9ca 100644 --- a/llvm/test/Linker/type-unique-simple2-a.ll +++ b/llvm/test/Linker/type-unique-simple2-a.ll @@ -1,6 +1,6 @@ ; REQUIRES: default_triple, object-emission ; -; RUN: llvm-link %s %p/type-unique-simple2-b.ll -S -o - | %llc_dwarf -filetype=obj -O0 | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llvm-link %s %p/type-unique-simple2-b.ll -S -o - | %llc_dwarf -filetype=obj -O0 | llvm-dwarfdump -debug-info - | FileCheck %s ; ; Tests for a merge error where attributes are inserted twice into the same DIE. ; diff --git a/llvm/test/Linker/type-unique-simple2.ll b/llvm/test/Linker/type-unique-simple2.ll index 7c31cdf5975..b806728faa6 100644 --- a/llvm/test/Linker/type-unique-simple2.ll +++ b/llvm/test/Linker/type-unique-simple2.ll @@ -4,4 +4,4 @@ ; RUN: llvm-link %S/Inputs/type-unique-simple2-a.ll %S/Inputs/type-unique-simple2-b.ll -S -o %t ; RUN: cat %t | FileCheck %S/Inputs/type-unique-simple2-a.ll -check-prefix=LINK ; RUN: %llc_dwarf -filetype=obj -O0 < %t > %t2 -; RUN: llvm-dwarfdump -debug-dump=info %t2 | FileCheck %S/Inputs/type-unique-simple2-a.ll +; RUN: llvm-dwarfdump -debug-info %t2 | FileCheck %S/Inputs/type-unique-simple2-a.ll diff --git a/llvm/test/Linker/type-unique-type-array-a.ll b/llvm/test/Linker/type-unique-type-array-a.ll index f6c70df70e9..b12400589a9 100644 --- a/llvm/test/Linker/type-unique-type-array-a.ll +++ b/llvm/test/Linker/type-unique-type-array-a.ll @@ -1,6 +1,6 @@ ; REQUIRES: default_triple, object-emission ; -; RUN: llvm-link %s %p/type-unique-type-array-b.ll -S -o - | %llc_dwarf -filetype=obj -O0 | llvm-dwarfdump -debug-dump=info - | FileCheck %s +; RUN: llvm-link %s %p/type-unique-type-array-b.ll -S -o - | %llc_dwarf -filetype=obj -O0 | llvm-dwarfdump -debug-info - | FileCheck %s ; ; rdar://problem/17628609 ; diff --git a/llvm/test/MC/ELF/comp-dir.s b/llvm/test/MC/ELF/comp-dir.s index c8d996faf32..ddef95e17c8 100644 --- a/llvm/test/MC/ELF/comp-dir.s +++ b/llvm/test/MC/ELF/comp-dir.s @@ -1,6 +1,6 @@ // REQUIRES: shell // RUN: llvm-mc -triple=x86_64-linux-unknown -g -fdebug-compilation-dir=/test/comp/dir %s -filetype=obj -o %t.o -// RUN: llvm-dwarfdump -debug-dump=info %t.o | FileCheck %s +// RUN: llvm-dwarfdump -debug-info %t.o | FileCheck %s // CHECK: DW_AT_comp_dir [DW_FORM_string] ("{{([A-Za-z]:.*)?}}/test/comp/dir") @@ -8,7 +8,7 @@ // RUN: ln -sf %t.foo %t.bar // RUN: cd %t.foo // RUN: env PWD=%t.bar llvm-mc -triple=x86_64-linux-unknown -g %s -filetype=obj -o %t.o -// RUN: llvm-dwarfdump -debug-dump=info %t.o | FileCheck --check-prefix=PWD %s +// RUN: llvm-dwarfdump -debug-info %t.o | FileCheck --check-prefix=PWD %s // PWD: DW_AT_comp_dir [DW_FORM_string] ("{{.*}}.bar") diff --git a/llvm/test/MC/ELF/compression.s b/llvm/test/MC/ELF/compression.s index 0777ee3f903..ed385517b3a 100644 --- a/llvm/test/MC/ELF/compression.s +++ b/llvm/test/MC/ELF/compression.s @@ -1,14 +1,14 @@ // Check zlib-gnu style // RUN: llvm-mc -filetype=obj -compress-debug-sections=zlib-gnu -triple x86_64-pc-linux-gnu < %s -o %t // RUN: llvm-objdump -s %t | FileCheck --check-prefix=CHECK-GNU-STYLE %s -// RUN: llvm-dwarfdump -debug-dump=str %t | FileCheck --check-prefix=STR %s +// RUN: llvm-dwarfdump -debug-str %t | FileCheck --check-prefix=STR %s // RUN: llvm-mc -filetype=obj -compress-debug-sections=zlib-gnu -triple i386-pc-linux-gnu < %s \ // RUN: | llvm-readobj -symbols - | FileCheck --check-prefix=386-SYMBOLS-GNU %s // Check zlib style // RUN: llvm-mc -filetype=obj -compress-debug-sections=zlib -triple x86_64-pc-linux-gnu < %s -o %t // RUN: llvm-objdump -s %t | FileCheck --check-prefix=CHECK-ZLIB-STYLE %s -// RUN: llvm-dwarfdump -debug-dump=str %t | FileCheck --check-prefix=STR %s +// RUN: llvm-dwarfdump -debug-str %t | FileCheck --check-prefix=STR %s // RUN: llvm-mc -filetype=obj -compress-debug-sections=zlib -triple i386-pc-linux-gnu < %s \ // RUN: | llvm-readobj -symbols - | FileCheck --check-prefix=386-SYMBOLS-ZLIB %s // RUN: llvm-readobj -sections %t | FileCheck --check-prefix=ZLIB-STYLE-FLAGS %s diff --git a/llvm/test/MC/ELF/discriminator.s b/llvm/test/MC/ELF/discriminator.s index 75e4e86cee0..8edb4c006a1 100644 --- a/llvm/test/MC/ELF/discriminator.s +++ b/llvm/test/MC/ELF/discriminator.s @@ -1,6 +1,6 @@ # RUN: llvm-mc -triple i386-unknown-unknown %s -filetype=obj -o %t.o # RUN: llvm-readobj -r %t.o | FileCheck %s -# RUN: llvm-dwarfdump -debug-dump=line %t.o | FileCheck %s -check-prefix=DWARF-DUMP +# RUN: llvm-dwarfdump -debug-line %t.o | FileCheck %s -check-prefix=DWARF-DUMP .file 1 "foo.c" .text diff --git a/llvm/test/MC/MachO/gen-dwarf-cpp.s b/llvm/test/MC/MachO/gen-dwarf-cpp.s index 04a9508aae2..784f2f88d8b 100644 --- a/llvm/test/MC/MachO/gen-dwarf-cpp.s +++ b/llvm/test/MC/MachO/gen-dwarf-cpp.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -g -triple i386-apple-darwin10 %s -filetype=obj -o %t -// RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s +// RUN: llvm-dwarfdump -debug-line %t | FileCheck %s # 100 "t.s" 1 .globl _bar diff --git a/llvm/test/MC/MachO/gen-dwarf-macro-cpp.s b/llvm/test/MC/MachO/gen-dwarf-macro-cpp.s index 6177814b6a7..9c3ba5d4b48 100644 --- a/llvm/test/MC/MachO/gen-dwarf-macro-cpp.s +++ b/llvm/test/MC/MachO/gen-dwarf-macro-cpp.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -g -triple i386-apple-darwin10 %s -filetype=obj -o %t -// RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s +// RUN: llvm-dwarfdump -debug-line %t | FileCheck %s # 1 "foo.S" 2 .macro switcher diff --git a/llvm/test/MC/MachO/gen-dwarf-producer.s b/llvm/test/MC/MachO/gen-dwarf-producer.s index f7388db3a24..3a8ce7d8aa3 100644 --- a/llvm/test/MC/MachO/gen-dwarf-producer.s +++ b/llvm/test/MC/MachO/gen-dwarf-producer.s @@ -1,5 +1,5 @@ // RUN: env DEBUG_PRODUCER="my producer" llvm-mc -g -triple i386-apple-darwin10 %s -filetype=obj -o %t -// RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s +// RUN: llvm-dwarfdump -debug-info %t | FileCheck %s .globl _bar _bar: diff --git a/llvm/test/MC/MachO/gen-dwarf.s b/llvm/test/MC/MachO/gen-dwarf.s index 22a8e93799d..b27159a104b 100644 --- a/llvm/test/MC/MachO/gen-dwarf.s +++ b/llvm/test/MC/MachO/gen-dwarf.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -g -triple i386-apple-darwin10 %s -filetype=obj -o %t -// RUN: llvm-dwarfdump -debug-dump=all %t | FileCheck %s +// RUN: llvm-dwarfdump -all %t | FileCheck %s .globl _bar _bar: diff --git a/llvm/test/MC/X86/gnux32-dwarf-gen.s b/llvm/test/MC/X86/gnux32-dwarf-gen.s index 6603125343d..61ddaebaaed 100644 --- a/llvm/test/MC/X86/gnux32-dwarf-gen.s +++ b/llvm/test/MC/X86/gnux32-dwarf-gen.s @@ -1,8 +1,8 @@ # RUN: llvm-mc -g -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t.64 -# RUN: llvm-dwarfdump -debug-dump=info %t.64 | FileCheck -check-prefix=DEFAULTABI %s +# RUN: llvm-dwarfdump -debug-info %t.64 | FileCheck -check-prefix=DEFAULTABI %s # RUN: llvm-mc -g -filetype=obj -triple x86_64-pc-linux-gnux32 %s -o %t.32 -# RUN: llvm-dwarfdump -debug-dump=info %t.32 | FileCheck -check-prefix=X32ABI %s +# RUN: llvm-dwarfdump -debug-info %t.32 | FileCheck -check-prefix=X32ABI %s # This test checks the dwarf info section emitted to the output object by the # assembler, looking at the difference between the x32 ABI and default x86-64 diff --git a/llvm/test/MC/X86/i386-darwin-frame-register.ll b/llvm/test/MC/X86/i386-darwin-frame-register.ll index 5f0cb6f20b2..5a433a99a59 100644 --- a/llvm/test/MC/X86/i386-darwin-frame-register.ll +++ b/llvm/test/MC/X86/i386-darwin-frame-register.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj %s -o - | llvm-dwarfdump -debug-dump=frames - | FileCheck %s +; RUN: llc -filetype=obj %s -o - | llvm-dwarfdump -debug-frames - | FileCheck %s ; IR reduced from a dummy: ; void foo() {} diff --git a/llvm/test/Object/Mips/reloc-visit.test b/llvm/test/Object/Mips/reloc-visit.test index d75551a387c..49b68cec12b 100644 --- a/llvm/test/Object/Mips/reloc-visit.test +++ b/llvm/test/Object/Mips/reloc-visit.test @@ -1,4 +1,4 @@ -RUN: llvm-dwarfdump -debug-dump=info %p/../Inputs/elf-mip64-reloc.o 2>&1 | \ +RUN: llvm-dwarfdump -debug-info %p/../Inputs/elf-mip64-reloc.o 2>&1 | \ RUN: FileCheck %s CHECK: DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000037] = "<stdin>") diff --git a/llvm/test/tools/dsymutil/ARM/scattered.c b/llvm/test/tools/dsymutil/ARM/scattered.c index 348cf33f682..01d9e1ab866 100644 --- a/llvm/test/tools/dsymutil/ARM/scattered.c +++ b/llvm/test/tools/dsymutil/ARM/scattered.c @@ -1,4 +1,4 @@ -RUN: llvm-dsymutil -y %p/dummy-debug-map.map -oso-prepend-path %p/../Inputs/scattered-reloc/ -f -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +RUN: llvm-dsymutil -y %p/dummy-debug-map.map -oso-prepend-path %p/../Inputs/scattered-reloc/ -f -o - | llvm-dwarfdump -debug-info - | FileCheck %s // See Inputs/scattered-reloc/scattered.s to see how this test // actually works. diff --git a/llvm/test/tools/dsymutil/X86/common-sym.test b/llvm/test/tools/dsymutil/X86/common-sym.test index 780c5deec62..8572d9f2056 100644 --- a/llvm/test/tools/dsymutil/X86/common-sym.test +++ b/llvm/test/tools/dsymutil/X86/common-sym.test @@ -1,4 +1,4 @@ -RUN: llvm-dsymutil -oso-prepend-path %p/.. %p/../Inputs/common.macho.x86_64 -f -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +RUN: llvm-dsymutil -oso-prepend-path %p/.. %p/../Inputs/common.macho.x86_64 -f -o - | llvm-dwarfdump -debug-info - | FileCheck %s The test was compiled from a single source: $ cat common.c diff --git a/llvm/test/tools/dsymutil/X86/custom-line-table.test b/llvm/test/tools/dsymutil/X86/custom-line-table.test index 86fd7e29468..424d86feed7 100644 --- a/llvm/test/tools/dsymutil/X86/custom-line-table.test +++ b/llvm/test/tools/dsymutil/X86/custom-line-table.test @@ -1,4 +1,4 @@ -# RUN: llvm-dsymutil -oso-prepend-path %p/../Inputs -y %s -f -o - | llvm-dwarfdump - -debug-dump=line | FileCheck %s +# RUN: llvm-dsymutil -oso-prepend-path %p/../Inputs -y %s -f -o - | llvm-dwarfdump - --debug-line | FileCheck %s # This test runs dsymutil on an object file with non-standard (as far # as llvm is concerned) line table settings. diff --git a/llvm/test/tools/dsymutil/X86/dead-stripped.cpp b/llvm/test/tools/dsymutil/X86/dead-stripped.cpp index ecab7580ec0..a0244157ed8 100644 --- a/llvm/test/tools/dsymutil/X86/dead-stripped.cpp +++ b/llvm/test/tools/dsymutil/X86/dead-stripped.cpp @@ -1,4 +1,4 @@ -// RUN: llvm-dsymutil -f -y %p/dummy-debug-map.map -oso-prepend-path %p/../Inputs/dead-stripped -o - | llvm-dwarfdump - -debug-dump=info | FileCheck %s +// RUN: llvm-dsymutil -f -y %p/dummy-debug-map.map -oso-prepend-path %p/../Inputs/dead-stripped -o - | llvm-dwarfdump - --debug-info | FileCheck %s // The test was compiled with: // clang++ -O2 -g -c dead-strip.cpp -o 1.o diff --git a/llvm/test/tools/dsymutil/X86/empty_range.s b/llvm/test/tools/dsymutil/X86/empty_range.s index dfe734f1b2b..c221b674313 100644 --- a/llvm/test/tools/dsymutil/X86/empty_range.s +++ b/llvm/test/tools/dsymutil/X86/empty_range.s @@ -4,7 +4,7 @@ # Compile with: # llvm-mc -triple x86_64-apple-darwin -filetype=obj -o 1.o empty_range.o -# RUN: llvm-dsymutil -f -y %p/dummy-debug-map.map -oso-prepend-path %p/../Inputs/empty_range -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +# RUN: llvm-dsymutil -f -y %p/dummy-debug-map.map -oso-prepend-path %p/../Inputs/empty_range -o - | llvm-dwarfdump -debug-info - | FileCheck %s .section __TEXT,__text,regular,pure_instructions .macosx_version_min 10, 11 diff --git a/llvm/test/tools/dsymutil/X86/fat-archive-input-i386.test b/llvm/test/tools/dsymutil/X86/fat-archive-input-i386.test index f4ea288768c..0765c38b6b2 100644 --- a/llvm/test/tools/dsymutil/X86/fat-archive-input-i386.test +++ b/llvm/test/tools/dsymutil/X86/fat-archive-input-i386.test @@ -1,5 +1,5 @@ # REQUIRES: object-emission -# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s --- triple: 'i386-apple-darwin' diff --git a/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64.test b/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64.test index cdd5a4c08d9..810b540e568 100644 --- a/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64.test +++ b/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64.test @@ -1,5 +1,5 @@ # REQUIRES: object-emission -# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s --- triple: 'x86_64-apple-darwin' diff --git a/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64h.test b/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64h.test index 53aed1ec444..03d430e6f2f 100644 --- a/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64h.test +++ b/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64h.test @@ -1,5 +1,5 @@ # REQUIRES: object-emission -# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s --- triple: 'x86_64h-apple-darwin' diff --git a/llvm/test/tools/dsymutil/X86/frame-1.test b/llvm/test/tools/dsymutil/X86/frame-1.test index 27bc17d7598..00f399bebe1 100644 --- a/llvm/test/tools/dsymutil/X86/frame-1.test +++ b/llvm/test/tools/dsymutil/X86/frame-1.test @@ -2,7 +2,7 @@ # RUN: rm -rf %t # RUN: mkdir -p %t # RUN: llc -filetype=obj %p/../Inputs/frame-dw2.ll -o %t/frame-dw2.o -# RUN: llvm-dsymutil -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-dump=frames - | FileCheck %s +# RUN: llvm-dsymutil -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-frames - | FileCheck %s # This test is meant to verify that identical CIEs will get reused # in the same file but also inbetween files. For this to happen, we diff --git a/llvm/test/tools/dsymutil/X86/frame-2.test b/llvm/test/tools/dsymutil/X86/frame-2.test index 89a7670f86f..9d7389088a8 100644 --- a/llvm/test/tools/dsymutil/X86/frame-2.test +++ b/llvm/test/tools/dsymutil/X86/frame-2.test @@ -3,7 +3,7 @@ # RUN: mkdir -p %t # RUN: llc -filetype=obj %p/../Inputs/frame-dw2.ll -o %t/frame-dw2.o # RUN: llc -filetype=obj %p/../Inputs/frame-dw4.ll -o %t/frame-dw4.o -# RUN: llvm-dsymutil -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-dump=frames - | FileCheck %s +# RUN: llvm-dsymutil -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-frames - | FileCheck %s # Check the handling of multiple different CIEs. To have CIEs that # appear to be different, use a dwarf2 version of the file along with diff --git a/llvm/test/tools/dsymutil/X86/modules-dwarf-version.m b/llvm/test/tools/dsymutil/X86/modules-dwarf-version.m index 54e6192458b..7fed28226d3 100644 --- a/llvm/test/tools/dsymutil/X86/modules-dwarf-version.m +++ b/llvm/test/tools/dsymutil/X86/modules-dwarf-version.m @@ -10,7 +10,7 @@ // RUN: cp %p/../Inputs/modules-dwarf-version/1.o %t.dir // RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir \ // RUN: -y %p/dummy-debug-map.map -o - \ -// RUN: | llvm-dwarfdump --debug-dump=info - | FileCheck %s +// RUN: | llvm-dwarfdump --debug-info - | FileCheck %s @import Bar; int main(int argc, char **argv) { diff --git a/llvm/test/tools/dsymutil/X86/modules-empty.m b/llvm/test/tools/dsymutil/X86/modules-empty.m index 3d95aa16880..22de004cf61 100644 --- a/llvm/test/tools/dsymutil/X86/modules-empty.m +++ b/llvm/test/tools/dsymutil/X86/modules-empty.m @@ -15,7 +15,7 @@ EOF // RUN: cp %p/../Inputs/modules-empty/1.o %p/../Inputs/modules-empty/Empty.pcm %t.dir // RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir \ // RUN: -y %p/dummy-debug-map.map -o - \ -// RUN: | llvm-dwarfdump --debug-dump=info - | FileCheck %s +// RUN: | llvm-dwarfdump --debug-info - | FileCheck %s #include "Empty.h" int main() { diff --git a/llvm/test/tools/dsymutil/X86/modules.m b/llvm/test/tools/dsymutil/X86/modules.m index f693ef9019b..ae9f533098e 100644 --- a/llvm/test/tools/dsymutil/X86/modules.m +++ b/llvm/test/tools/dsymutil/X86/modules.m @@ -20,7 +20,7 @@ EOF // RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/modules \ // RUN: -y %p/dummy-debug-map.map -o - \ -// RUN: | llvm-dwarfdump --debug-dump=info - | FileCheck %s +// RUN: | llvm-dwarfdump --debug-info - | FileCheck %s // RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/modules -y \ // RUN: %p/dummy-debug-map.map -o %t 2>&1 | FileCheck --check-prefix=WARN %s diff --git a/llvm/test/tools/dsymutil/X86/odr-anon-namespace.cpp b/llvm/test/tools/dsymutil/X86/odr-anon-namespace.cpp index a66fc830b67..c414a2a2ca9 100644 --- a/llvm/test/tools/dsymutil/X86/odr-anon-namespace.cpp +++ b/llvm/test/tools/dsymutil/X86/odr-anon-namespace.cpp @@ -4,7 +4,7 @@ done */ -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-anon-namespace -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-anon-namespace -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -debug-info - | FileCheck %s #ifdef FILE1 // Currently llvm-dsymutil will unique the contents of anonymous diff --git a/llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp b/llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp index 7aef0057d21..10fbd8a0e94 100644 --- a/llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp +++ b/llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp @@ -4,7 +4,7 @@ done */ -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-fwd-declaration -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-fwd-declaration -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -debug-info - | FileCheck %s #ifdef FILE1 # 1 "Header.h" 1 diff --git a/llvm/test/tools/dsymutil/X86/odr-fwd-declaration2.cpp b/llvm/test/tools/dsymutil/X86/odr-fwd-declaration2.cpp index 1b0d261b5bd..5847fd7c0b2 100644 --- a/llvm/test/tools/dsymutil/X86/odr-fwd-declaration2.cpp +++ b/llvm/test/tools/dsymutil/X86/odr-fwd-declaration2.cpp @@ -4,7 +4,7 @@ done */ -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-fwd-declaration2 -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-fwd-declaration2 -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -debug-info - | FileCheck %s #ifdef FILE1 # 1 "Header.h" 1 diff --git a/llvm/test/tools/dsymutil/X86/odr-member-functions.cpp b/llvm/test/tools/dsymutil/X86/odr-member-functions.cpp index 737d5a7abf6..fcb05a753b0 100644 --- a/llvm/test/tools/dsymutil/X86/odr-member-functions.cpp +++ b/llvm/test/tools/dsymutil/X86/odr-member-functions.cpp @@ -4,7 +4,7 @@ done */ -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-member-functions -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -debug-dump=info - | FileCheck %s +// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-member-functions -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -debug-info - | FileCheck %s struct S { __attribute__((always_inline)) void foo() { bar(); } diff --git a/llvm/test/tools/dsymutil/X86/odr-uniquing.cpp b/llvm/test/tools/dsymutil/X86/odr-uniquing.cpp index bb7ae50a2c7..9067274579d 100644 --- a/llvm/test/tools/dsymutil/X86/odr-uniquing.cpp +++ b/llvm/test/tools/dsymutil/X86/odr-uniquing.cpp @@ -11,8 +11,8 @@ - without ODR uniquing: all types are re-emited in the second CU */ -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-uniquing -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -debug-dump=info - | FileCheck -check-prefix=ODR -check-prefix=CHECK %s -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-uniquing -y %p/dummy-debug-map.map -no-odr -o - | llvm-dwarfdump -debug-dump=info - | FileCheck -check-prefix=NOODR -check-prefix=CHECK %s +// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-uniquing -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -debug-info - | FileCheck -check-prefix=ODR -check-prefix=CHECK %s +// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-uniquing -y %p/dummy-debug-map.map -no-odr -o - | llvm-dwarfdump -debug-info - | FileCheck -check-prefix=NOODR -check-prefix=CHECK %s // The first compile unit contains all the types: // CHECK: TAG_compile_unit diff --git a/llvm/test/tools/dsymutil/X86/submodules.m b/llvm/test/tools/dsymutil/X86/submodules.m index b2425a91cbd..3e2891f59b1 100644 --- a/llvm/test/tools/dsymutil/X86/submodules.m +++ b/llvm/test/tools/dsymutil/X86/submodules.m @@ -18,7 +18,7 @@ EOF // RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/submodules \ // RUN: -y %p/dummy-debug-map.map -o - \ -// RUN: | llvm-dwarfdump --debug-dump=info - | FileCheck %s +// RUN: | llvm-dwarfdump --debug-info - | FileCheck %s // --------------------------------------------------------------------- #ifdef CHILD_H diff --git a/llvm/test/tools/llvm-dwarfdump/X86/brief.s b/llvm/test/tools/llvm-dwarfdump/X86/brief.s index 8e10f1d2de0..70e19516c6f 100644 --- a/llvm/test/tools/llvm-dwarfdump/X86/brief.s +++ b/llvm/test/tools/llvm-dwarfdump/X86/brief.s @@ -1,5 +1,5 @@ # RUN: llvm-mc %s -filetype obj -triple x86_64-apple-darwin -o - \ -# RUN: | llvm-dwarfdump -debug-dump=info -brief - \ +# RUN: | llvm-dwarfdump -debug-info --brief - \ # RUN: | FileCheck %s # CHECK-NOT: .debug_abbrev contents: diff --git a/llvm/test/tools/llvm-dwarfdump/X86/multiple-sections.test b/llvm/test/tools/llvm-dwarfdump/X86/multiple-sections.test new file mode 100644 index 00000000000..9667ae95c6a --- /dev/null +++ b/llvm/test/tools/llvm-dwarfdump/X86/multiple-sections.test @@ -0,0 +1,9 @@ +# RUN: llvm-mc %S/brief.s -filetype obj -triple x86_64-apple-darwin -o - \ +# RUN: | llvm-dwarfdump -debug-abbrev -debug-info - \ +# RUN: | FileCheck %s + +# CHECK-NOT: contents: +# CHECK: .debug_abbrev contents: +# CHECK-NOT: contents: +# CHECK: .debug_info contents: +# CHECK-NOT: contents: diff --git a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp index 39a035d8129..990104b71c7 100644 --- a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp +++ b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp @@ -40,51 +40,23 @@ static cl::list<std::string> InputFilenames(cl::Positional, cl::desc("<input object files or .dSYM bundles>"), cl::ZeroOrMore); -static cl::opt<DIDumpType> DumpType( - "debug-dump", cl::init(DIDT_Null), cl::desc("Dump of debug sections:"), - cl::values( - clEnumValN(DIDT_All, "all", "Dump all debug sections"), - clEnumValN(DIDT_Abbrev, "abbrev", ".debug_abbrev"), - clEnumValN(DIDT_AbbrevDwo, "abbrev.dwo", ".debug_abbrev.dwo"), - clEnumValN(DIDT_AppleNames, "apple_names", ".apple_names"), - clEnumValN(DIDT_AppleTypes, "apple_types", ".apple_types"), - clEnumValN(DIDT_AppleNamespaces, "apple_namespaces", - ".apple_namespaces"), - clEnumValN(DIDT_AppleObjC, "apple_objc", ".apple_objc"), - clEnumValN(DIDT_Aranges, "aranges", ".debug_aranges"), - clEnumValN(DIDT_Info, "info", ".debug_info"), - clEnumValN(DIDT_InfoDwo, "info.dwo", ".debug_info.dwo"), - clEnumValN(DIDT_Types, "types", ".debug_types"), - clEnumValN(DIDT_TypesDwo, "types.dwo", ".debug_types.dwo"), - clEnumValN(DIDT_Line, "line", ".debug_line"), - clEnumValN(DIDT_LineDwo, "line.dwo", ".debug_line.dwo"), - clEnumValN(DIDT_Loc, "loc", ".debug_loc"), - clEnumValN(DIDT_LocDwo, "loc.dwo", ".debug_loc.dwo"), - clEnumValN(DIDT_Frames, "frames", ".debug_frame"), - clEnumValN(DIDT_Macro, "macro", ".debug_macinfo"), - clEnumValN(DIDT_Ranges, "ranges", ".debug_ranges"), - clEnumValN(DIDT_Pubnames, "pubnames", ".debug_pubnames"), - clEnumValN(DIDT_Pubtypes, "pubtypes", ".debug_pubtypes"), - clEnumValN(DIDT_GnuPubnames, "gnu_pubnames", ".debug_gnu_pubnames"), - clEnumValN(DIDT_GnuPubtypes, "gnu_pubtypes", ".debug_gnu_pubtypes"), - clEnumValN(DIDT_Str, "str", ".debug_str"), - clEnumValN(DIDT_StrOffsets, "str_offsets", ".debug_str_offsets"), - clEnumValN(DIDT_StrDwo, "str.dwo", ".debug_str.dwo"), - clEnumValN(DIDT_StrOffsetsDwo, "str_offsets.dwo", - ".debug_str_offsets.dwo"), - clEnumValN(DIDT_CUIndex, "cu_index", ".debug_cu_index"), - clEnumValN(DIDT_GdbIndex, "gdb_index", ".gdb_index"), - clEnumValN(DIDT_TUIndex, "tu_index", ".debug_tu_index"))); +static cl::opt<bool> DumpAll("all", cl::desc("Dump all debug info sections")); +static cl::alias DumpAllAlias("a", cl::desc("Alias for --all"), + cl::aliasopt(DumpAll)); + +static uint64_t DumpType = DIDT_Null; +#define HANDLE_DWARF_SECTION(ENUM_NAME, ELF_NAME, CMDLINE_NAME) \ + static cl::opt<bool> Dump##ENUM_NAME( \ + CMDLINE_NAME, cl::desc("Dump the " ELF_NAME " section")); +#include "llvm/BinaryFormat/Dwarf.def" +#undef HANDLE_DWARF_SECTION static cl::opt<bool> SummarizeTypes("summarize-types", cl::desc("Abbreviate the description of type unit entries")); - static cl::opt<bool> Verify("verify", cl::desc("Verify the DWARF debug info")); - static cl::opt<bool> Quiet("quiet", cl::desc("Use with -verify to not emit to STDOUT.")); - static cl::opt<bool> Brief("brief", cl::desc("Print fewer low-level details")); static void error(StringRef Filename, std::error_code EC) { @@ -219,9 +191,16 @@ int main(int argc, char **argv) { // Defaults to dumping all sections, unless brief mode is specified in which // case only the .debug_info section in dumped. +#define HANDLE_DWARF_SECTION(ENUM_NAME, ELF_NAME, CMDLINE_NAME) \ + if (Dump##ENUM_NAME) \ + DumpType |= DIDT_##ENUM_NAME; +#include "llvm/BinaryFormat/Dwarf.def" +#undef HANDLE_DWARF_SECTION + if (DumpAll) + DumpType = DIDT_All; if (DumpType == DIDT_Null) { if (Brief) - DumpType = DIDT_Info; + DumpType = DIDT_DebugInfo; else DumpType = DIDT_All; } diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 579917550fa..6cb7dc4c74d 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -191,7 +191,7 @@ cl::opt<bool> PrintFaultMaps("fault-map-section", cl::opt<DIDumpType> llvm::DwarfDumpType( "dwarf", cl::init(DIDT_Null), cl::desc("Dump of dwarf debug sections:"), - cl::values(clEnumValN(DIDT_Frames, "frames", ".debug_frame"))); + cl::values(clEnumValN(DIDT_DebugFrames, "frames", ".debug_frame"))); cl::opt<bool> PrintSource( "source", |
