Index: include/llvm/DebugInfo/DWARF/DWARFDie.h =================================================================== --- include/llvm/DebugInfo/DWARF/DWARFDie.h +++ include/llvm/DebugInfo/DWARF/DWARFDie.h @@ -120,7 +120,8 @@ /// \param recurseDepth the depth to recurse to when dumping this DIE and its /// children. /// \param indent the number of characters to indent each line that is output. - void dump(raw_ostream &OS, unsigned recurseDepth, unsigned indent = 0, DIDumpOptions DumpOpts = DIDumpOptions()) const; + void dump(raw_ostream &OS, unsigned recurseDepth, unsigned indent = 0, + DIDumpOptions DumpOpts = DIDumpOptions()) const; /// Extract the specified attribute from this DIE. /// Index: lib/DebugInfo/DWARF/DWARFDie.cpp =================================================================== --- lib/DebugInfo/DWARF/DWARFDie.cpp +++ lib/DebugInfo/DWARF/DWARFDie.cpp @@ -78,15 +78,15 @@ WithColor(OS, syntax::Attribute) << attrString; else WithColor(OS, syntax::Attribute).get() << format("DW_AT_Unknown_%x", Attr); - - if(!DumpOpts.Brief){ + + if (!DumpOpts.Brief) { auto formString = FormEncodingString(Form); if (!formString.empty()) OS << " [" << formString << ']'; else OS << format(" [DW_FORM_Unknown_%x]", Form); } - + DWARFUnit *U = Die.getDwarfUnit(); DWARFFormValue formValue(Form); @@ -128,9 +128,8 @@ dumpRanges(OS, Die.getAddressRanges(), U->getAddressByteSize(), sizeof(BaseIndent)+Indent+4); } - - OS << ")\n"; + OS << ")\n"; } bool DWARFDie::isSubprogramDIE() const { @@ -326,70 +325,12 @@ else WithColor(OS, syntax::Tag).get().indent(Indent) << format("DW_TAG_Unknown_%x", getTag()); - - if(!DumpOpts.Brief) - OS << format(" [%u] %c", abbrCode, - AbbrevDecl->hasChildren() ? '*' : ' '); - OS << '\n'; - - // Dump all data in the DIE for the attributes. - for (const auto &AttrSpec : AbbrevDecl->attributes()) { - if (AttrSpec.Form == DW_FORM_implicit_const) { - // We are dumping .debug_info section , - // implicit_const attribute values are not really stored here, - // but in .debug_abbrev section. So we just skip such attrs. - continue; - } - dumpAttribute(OS, *this, &offset, AttrSpec.Attr, AttrSpec.Form, - Indent, DumpOpts); - } - - DWARFDie child = getFirstChild(); - if (RecurseDepth > 0 && child) { - while (child) { - child.dump(OS, RecurseDepth-1, Indent+2, DumpOpts); - child = child.getSibling(); - } - } - } else { - OS << "Abbreviation code not found in 'debug_abbrev' class for code: " - << abbrCode << '\n'; - } - } else { - OS.indent(Indent) << "NULL\n"; - } - } -} -/* -void DWARFDie::dump(raw_ostream &OS, unsigned RecurseDepth, - unsigned Indent, DIDumpOptions DumpOpts) const { - if (!isValid()) - return; - DataExtractor debug_info_data = U->getDebugInfoExtractor(); - const uint32_t Offset = getOffset(); - uint32_t offset = Offset; - - if (debug_info_data.isValidOffset(offset)) { - uint32_t abbrCode = debug_info_data.getULEB128(&offset); - WithColor(OS, syntax::Address).get() << format("\n0x%8.8x: ", Offset); - - if (abbrCode) { - auto AbbrevDecl = getAbbreviationDeclarationPtr(); - if (AbbrevDecl) { - auto tagString = TagString(getTag()); - if (!tagString.empty()) - WithColor(OS, syntax::Tag).get().indent(Indent) << tagString; - else - WithColor(OS, syntax::Tag).get().indent(Indent) - << format("DW_TAG_Unknown_%x", getTag()); - - if(!DumpOpts.Brief){ + if (!DumpOpts.Brief) OS << format(" [%u] %c", abbrCode, - AbbrevDecl->hasChildren() ? '*' : ' '); - } + AbbrevDecl->hasChildren() ? '*' : ' '); OS << '\n'; - + // Dump all data in the DIE for the attributes. for (const auto &AttrSpec : AbbrevDecl->attributes()) { if (AttrSpec.Form == DW_FORM_implicit_const) { @@ -418,7 +359,7 @@ } } } -*/ + DWARFDie DWARFDie::getParent() const { if (isValid()) return U->getParent(Die); Index: test/tools/llvm-dwarfdump/X86/brief.s =================================================================== --- test/tools/llvm-dwarfdump/X86/brief.s +++ test/tools/llvm-dwarfdump/X86/brief.s @@ -6,17 +6,24 @@ # CHECK-NOT: [{{[0-9]+}}] # CHECK-NOT: DW_FORM +# This test verifies that --brief hides DW_FORMs and +# abbreviation codes from .debug_info section. + .section __TEXT,__text,regular,pure_instructions + .file 1 "basic.c" + .comm _i,4,2 ## @i .section __DWARF,__debug_str,regular,debug Linfo_string: .asciz "basic.c" ## string offset=42 + .asciz "i" ## string offset=84 + .asciz "int" ## string offset=86 .section __DWARF,__debug_loc,regular,debug Lsection_debug_loc: .section __DWARF,__debug_abbrev,regular,debug Lsection_abbrev: .byte 1 ## Abbreviation Code .byte 17 ## DW_TAG_compile_unit - .byte 0 ## DW_CHILDREN_no + .byte 1 ## DW_CHILDREN_yes .byte 37 ## DW_AT_producer .byte 14 ## DW_FORM_strp .byte 19 ## DW_AT_language @@ -29,22 +36,64 @@ .byte 14 ## DW_FORM_strp .byte 0 ## EOM(1) .byte 0 ## EOM(2) + .byte 2 ## Abbreviation Code + .byte 52 ## DW_TAG_variable + .byte 0 ## DW_CHILDREN_no + .byte 3 ## DW_AT_name + .byte 14 ## DW_FORM_strp + .byte 73 ## DW_AT_type + .byte 19 ## DW_FORM_ref4 + .byte 63 ## DW_AT_external + .byte 25 ## DW_FORM_flag_present + .byte 58 ## DW_AT_decl_file + .byte 11 ## DW_FORM_data1 + .byte 59 ## DW_AT_decl_line + .byte 11 ## DW_FORM_data1 + .byte 2 ## DW_AT_location + .byte 24 ## DW_FORM_exprloc + .byte 0 ## EOM(1) + .byte 0 ## EOM(2) + .byte 3 ## Abbreviation Code + .byte 36 ## DW_TAG_base_type + .byte 0 ## DW_CHILDREN_no + .byte 3 ## DW_AT_name + .byte 14 ## DW_FORM_strp + .byte 62 ## DW_AT_encoding + .byte 11 ## DW_FORM_data1 + .byte 11 ## DW_AT_byte_size + .byte 11 ## DW_FORM_data1 + .byte 0 ## EOM(1) + .byte 0 ## EOM(2) .byte 0 ## EOM(3) .section __DWARF,__debug_info,regular,debug Lsection_info: Lcu_begin0: - .long 26 ## Length of Unit + .long 55 ## Length of Unit .short 4 ## DWARF version number Lset0 = Lsection_abbrev-Lsection_abbrev ## Offset Into Abbrev. Section .long Lset0 .byte 8 ## Address Size (in bytes) - .byte 1 ## Abbrev [1] 0xb:0x13 DW_TAG_compile_unit + .byte 1 ## Abbrev [1] 0xb:0x30 DW_TAG_compile_unit .long 0 ## DW_AT_producer .short 12 ## DW_AT_language .long 42 ## DW_AT_name Lset1 = Lline_table_start0-Lsection_line ## DW_AT_stmt_list .long Lset1 .long 50 ## DW_AT_comp_dir + .byte 2 ## Abbrev [2] 0x1e:0x15 DW_TAG_variable + .long 84 ## DW_AT_name + .long 51 ## DW_AT_type + ## DW_AT_external + .byte 1 ## DW_AT_decl_file + .byte 1 ## DW_AT_decl_line + .byte 9 ## DW_AT_location + .byte 3 + .quad _i + .byte 3 ## Abbrev [3] 0x33:0x7 DW_TAG_base_type + .long 86 ## DW_AT_name + .byte 5 ## DW_AT_encoding + .byte 4 ## DW_AT_byte_size + .byte 0 ## End Of Children Mark .section __DWARF,__debug_ranges,regular,debug Ldebug_range: .section __DWARF,__debug_macinfo,regular,debug @@ -57,13 +106,20 @@ .short 1 ## Header Version .short 0 ## Header Hash Function .long 1 ## Header Bucket Count - .long 0 ## Header Hash Count + .long 1 ## Header Hash Count .long 12 ## Header Data Length .long 0 ## HeaderData Die Offset Base .long 1 ## HeaderData Atom Count .short 1 ## DW_ATOM_die_offset .short 6 ## DW_FORM_data4 - .long -1 ## Bucket 0 + .long 0 ## Bucket 0 + .long 177678 ## Hash in Bucket 0 + .long LNames0-Lnames_begin ## Offset in Bucket 0 +LNames0: + .long 84 ## i + .long 1 ## Num DIEs + .long 30 + .long 0 .section __DWARF,__apple_objc,regular,debug Lobjc_begin: .long 1212240712 ## Header Magic @@ -96,7 +152,7 @@ .short 1 ## Header Version .short 0 ## Header Hash Function .long 1 ## Header Bucket Count - .long 0 ## Header Hash Count + .long 1 ## Header Hash Count .long 20 ## Header Data Length .long 0 ## HeaderData Die Offset Base .long 3 ## HeaderData Atom Count @@ -106,7 +162,16 @@ .short 5 ## DW_FORM_data2 .short 4 ## DW_ATOM_type_flags .short 11 ## DW_FORM_data1 - .long -1 ## Bucket 0 + .long 0 ## Bucket 0 + .long 193495088 ## Hash in Bucket 0 + .long Ltypes0-Ltypes_begin ## Offset in Bucket 0 +Ltypes0: + .long 86 ## int + .long 1 ## Num DIEs + .long 51 + .short 36 + .byte 0 + .long 0 .section __DWARF,__apple_exttypes,regular,debug Lexttypes_begin: .long 1212240712 ## Header Magic @@ -124,5 +189,4 @@ .subsections_via_symbols .section __DWARF,__debug_line,regular,debug Lsection_line: -Lline_table_start0: - \ No newline at end of file +Lline_table_start0: \ No newline at end of file Index: tools/llvm-dwarfdump/llvm-dwarfdump.cpp =================================================================== --- tools/llvm-dwarfdump/llvm-dwarfdump.cpp +++ tools/llvm-dwarfdump/llvm-dwarfdump.cpp @@ -83,7 +83,7 @@ static cl::opt Quiet("quiet", cl::desc("Use with -verify to not emit to STDOUT.")); -static cl::opt Brief("brief", cl::desc("Do not emit attribute forms.")); +static cl::opt Brief("brief", cl::desc("Print fewer low-level details")); static void error(StringRef Filename, std::error_code EC) { if (!EC)