diff --git a/llvm/docs/CommandGuide/llvm-symbolizer.rst b/llvm/docs/CommandGuide/llvm-symbolizer.rst --- a/llvm/docs/CommandGuide/llvm-symbolizer.rst +++ b/llvm/docs/CommandGuide/llvm-symbolizer.rst @@ -236,7 +236,7 @@ .. _llvm-symbolizer-opt-output-style: -.. option:: --output-style +.. option:: --output-style Specify the preferred output style. Defaults to ``LLVM``. When the output style is set to ``GNU``, the tool follows the style of GNU's **addr2line**. @@ -253,6 +253,8 @@ * Prints an address's debug-data discriminator when it is non-zero. One way to produce discriminators is to compile with clang's -fdebug-info-for-profiling. + ``JSON`` style provides a machine readable output in JSON. + .. code-block:: console $ llvm-symbolizer --obj=inlined.elf 0x4004be 0x400486 -p @@ -274,6 +276,17 @@ $ llvm-symbolizer --output-style=GNU --obj=profiling.elf 0x401167 -p --no-inlines main at /tmp/test.cpp:15 (discriminator 2) + $ llvm-symbolizer --output-style=JSON --obj=inlined.elf 0x4004be 0x400486 + [{"ModuleName":"inlined.elf","Address":"0x4004be","Error":{"Code":0},"Symbol": + [{"FunctionName":"baz()","StartFileName":"/tmp/test.cpp","StartLine":9,"FileName":"/tmp/test.cpp","Line":11,"Column":18}, + {"FunctionName":"main","StartFileName":"/tmp/test.cpp","StartLine":14,"FileName":"/tmp/test.cpp","Line":15}]}, + {"ModuleName":"inlined.elf","Address":"0x400486","Error":{"Code":0},"Symbol": + [{"FunctionName":"foo()","StartFileName":"/tmp/test.cpp","StartLine":5,"FileName":"/tmp/test.cpp","Line": 6,"Column": 3}]}] + + $ llvm-symbolizer --output-style=JSON --obj=inlined.elf 0x4004be --no-inlines + {"ModuleName":"inlined.elf","Address":"0x4004be","Error":{"Code":0},"Symbol": + [{"FunctionName":"main","StartFileName":"/tmp/test.cpp","StartLine":14,"FileName":"/tmp/test.cpp","Line":11,"Column":18}]} + .. option:: --pretty-print, -p Print human readable output. If :option:`--inlining` is specified, the diff --git a/llvm/include/llvm/DebugInfo/Symbolize/DIPrinter.h b/llvm/include/llvm/DebugInfo/Symbolize/DIPrinter.h --- a/llvm/include/llvm/DebugInfo/Symbolize/DIPrinter.h +++ b/llvm/include/llvm/DebugInfo/Symbolize/DIPrinter.h @@ -112,6 +112,26 @@ GNUPrinter(raw_ostream &OS, raw_ostream &ES, PrinterConfig &Config) : PlainPrinterBase(OS, ES, Config) {} }; + +class JSONPrinter : public DIPrinter { +private: + raw_ostream &OS; + +public: + JSONPrinter(raw_ostream &OS) : DIPrinter(), OS(OS) {} + + void print(const Request &Request, const DILineInfo &Info) override; + void print(const Request &Request, const DIInliningInfo &Info) override; + void print(const Request &Request, const DIGlobal &Global) override; + void print(const Request &Request, + const std::vector &Locals) override; + + void printInvalidCommand(const Request &Request, + const ErrorInfoBase &ErrorInfo) override; + + bool printError(const Request &Request, const ErrorInfoBase &ErrorInfo, + StringRef ErrorBanner) override; +}; } // namespace symbolize } // namespace llvm diff --git a/llvm/lib/DebugInfo/Symbolize/DIPrinter.cpp b/llvm/lib/DebugInfo/Symbolize/DIPrinter.cpp --- a/llvm/lib/DebugInfo/Symbolize/DIPrinter.cpp +++ b/llvm/lib/DebugInfo/Symbolize/DIPrinter.cpp @@ -16,6 +16,7 @@ #include "llvm/DebugInfo/DIContext.h" #include "llvm/Support/ErrorOr.h" #include "llvm/Support/Format.h" +#include "llvm/Support/JSON.h" #include "llvm/Support/LineIterator.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" @@ -210,5 +211,152 @@ return true; } +std::string toHex(uint64_t V) { return ("0x" + Twine::utohexstr(V)).str(); } + +void toJSON(json::OStream &J, const Request &Request, int ErrorCode = 0, + const StringRef ErrorMsg = "") { + if (!Request.ModuleName.empty()) + J.attribute("ModuleName", Request.ModuleName); + J.attribute("Address", toHex(Request.Address)); + J.attributeObject("Error", [&] { + J.attribute("Code", ErrorCode); + if (!ErrorMsg.empty()) + J.attribute("Message", ErrorMsg); + }); +} + +static void toJSON(json::OStream &J, const DILineInfo &Info) { + J.objectBegin(); + if (Info.Source) + J.attribute("Source", *Info.Source); + if (Info.FunctionName != DILineInfo::BadString) + J.attribute("FunctionName", Info.FunctionName); + if (Info.StartFileName != DILineInfo::BadString) + J.attribute("StartFileName", Info.StartFileName); + if (Info.StartLine) + J.attribute("StartLine", Info.StartLine); + if (Info.FileName != DILineInfo::BadString) + J.attribute("FileName", Info.FileName); + // Print only valid line and column to reduce noise in the output. + if (Info.Line) + J.attribute("Line", Info.Line); + if (Info.Column) + J.attribute("Column", Info.Column); + if (Info.Discriminator) + J.attribute("Discriminator", Info.Discriminator); + J.objectEnd(); +} + +void JSONPrinter::print(const Request &Request, const DILineInfo &Info) { + { + json::OStream J(OS); + J.objectBegin(); + toJSON(J, Request); + J.attributeBegin("Symbol"); + J.arrayBegin(); + toJSON(J, Info); + J.arrayEnd(); + J.attributeEnd(); + J.objectEnd(); + } + OS << '\n'; +} + +void JSONPrinter::print(const Request &Request, const DIInliningInfo &Info) { + { + json::OStream J(OS); + J.objectBegin(); + toJSON(J, Request); + J.attributeBegin("Symbol"); + J.arrayBegin(); + uint32_t FramesNum = Info.getNumberOfFrames(); + for (uint32_t I = 0; I < FramesNum; ++I) { + OS << '\n'; + toJSON(J, Info.getFrame(I)); + } + J.arrayEnd(); + J.attributeEnd(); + J.objectEnd(); + } + OS << '\n'; +} + +void JSONPrinter::print(const Request &Request, const DIGlobal &Global) { + { + json::OStream J(OS); + J.objectBegin(); + toJSON(J, Request); + J.attributeBegin("Data"); + J.objectBegin(); + if (Global.Name != DILineInfo::BadString) + J.attribute("Name", Global.Name); + J.attribute("Start", toHex(Global.Start)); + J.attribute("Size", toHex(Global.Size)); + J.objectEnd(); + J.attributeEnd(); + J.objectEnd(); + } + OS << '\n'; +} + +void JSONPrinter::print(const Request &Request, + const std::vector &Locals) { + { + json::OStream J(OS); + J.objectBegin(); + toJSON(J, Request); + J.attributeBegin("Frame"); + J.arrayBegin(); + for (const DILocal &L : Locals) { + OS << '\n'; + J.objectBegin(); + if (!L.FunctionName.empty()) + J.attribute("FunctionName", L.FunctionName); + if (!L.Name.empty()) + J.attribute("Name", L.Name); + if (!L.DeclFile.empty()) + J.attribute("DeclFile", L.DeclFile); + J.attribute("DeclLine", int64_t(L.DeclLine)); + if (L.FrameOffset) + J.attribute("FrameOffset", *L.FrameOffset); + if (L.Size) + J.attribute("Size", toHex(*L.Size)); + if (L.TagOffset) + J.attribute("TagOffset", toHex(*L.TagOffset)); + J.objectEnd(); + } + J.arrayEnd(); + J.attributeEnd(); + J.objectEnd(); + } + OS << '\n'; +} + +void JSONPrinter::printInvalidCommand(const Request &Request, + const ErrorInfoBase &ErrorInfo) { + { + json::OStream J(OS); + J.objectBegin(); + toJSON(J, Request, ErrorInfo.convertToErrorCode().value(), + "unable to parse arguments: " + ErrorInfo.message()); + J.objectEnd(); + } + OS << '\n'; +} + +bool JSONPrinter::printError(const Request &Request, + const ErrorInfoBase &ErrorInfo, + StringRef ErrorBanner) { + { + json::OStream J(OS); + J.objectBegin(); + toJSON(J, Request, ErrorInfo.convertToErrorCode().value(), + ErrorInfo.message()); + J.objectEnd(); + } + OS << '\n'; + return false; +} + } // end namespace symbolize } // end namespace llvm diff --git a/llvm/test/tools/llvm-symbolizer/output-style-json-code.test b/llvm/test/tools/llvm-symbolizer/output-style-json-code.test new file mode 100644 --- /dev/null +++ b/llvm/test/tools/llvm-symbolizer/output-style-json-code.test @@ -0,0 +1,67 @@ +## This test checks JSON output for CODE. + +## Handle symbolize library error - file does not exist, no-inlines. +# RUN: llvm-symbolizer --output-style=JSON --no-inlines -e %p/no-file.exe 0 | \ +# RUN: FileCheck %s -DMSG=%errc_ENOENT --check-prefix=NO-FILE --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +## Handle symbolize library error - file does not exist, inline. +# RUN: llvm-symbolizer --output-style=JSON -e %p/no-file.exe 0 | \ +# RUN: FileCheck %s -DMSG=%errc_ENOENT --check-prefix=NO-FILE --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +# NO-FILE:{"ModuleName":"{{.*}}/no-file.exe","Address":"0x0","Error":{"Code":2,"Message":"[[MSG]]"}} + +## Resolve out of range address, no-inlines. Expected empty object, as all the default values are omitted. +# RUN: llvm-symbolizer --output-style=JSON --no-inlines -e %p/Inputs/addr.exe 1000000000 | \ +# RUN: FileCheck %s --check-prefix=NOT-FOUND-1 --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +# NOT-FOUND-1:{"ModuleName":"{{.*}}/Inputs/addr.exe","Address":"0x3b9aca00","Error":{"Code":0},"Symbol":[{}]} + +## Resolve out of range address, inlines. Expected a Frames list with one empty object, as all the default values are omitted. +# RUN: llvm-symbolizer --output-style=JSON -e %p/Inputs/addr.exe 1000000000 | \ +# RUN: FileCheck %s --check-prefix=NOT-FOUND-2 --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +# NOT-FOUND-2:{"ModuleName":"{{.*}}/Inputs/addr.exe","Address":"0x3b9aca00","Error":{"Code":0},"Symbol":[ +# NOT-FOUND-2-NEXT:{}]} + +# RUN: llvm-symbolizer --output-style=JSON --no-inlines -e %p/Inputs/addr.exe < %p/Inputs/addr.inp | \ +# RUN: FileCheck %s --check-prefix=NO-INLINES --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +## Invalid first argument before any valid one, no-inlines +# NO-INLINES:{"ModuleName":"{{.*}}/Inputs/addr.exe","Address":"0x0","Error":{"Code":22,"Message":"unable to parse arguments: some text"}} + +## Resolve valid address, no-inlines. +# NO-INLINES-NEXT:{"ModuleName":"{{.*}}/Inputs/addr.exe","Address":"0x40054d","Error":{"Code":0},"Symbol":[{"FunctionName":"main","StartFileName":"/tmp{{/|\\\\}}x.c","StartLine":2,"FileName":"/tmp{{/|\\\\}}x.c","Line":3,"Column":3}]} + +## Invalid argument after a valid one, no-inlines. +# NO-INLINES-NEXT:{"ModuleName":"{{.*}}/Inputs/addr.exe","Address":"0x0","Error":{"Code":22,"Message":"unable to parse arguments: some text2"}} + +# RUN: llvm-symbolizer --output-style=JSON -e %p/Inputs/addr.exe < %p/Inputs/addr.inp | \ +# RUN: FileCheck %s --check-prefix=INLINE --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +## Invalid first argument before any valid one, inlines +# INLINE:{"ModuleName":"{{.*}}/Inputs/addr.exe","Address":"0x0","Error":{"Code":22,"Message":"unable to parse arguments: some text"}} + +## Resolve valid address, inlines. +# INLINE-NEXT:{"ModuleName":"{{.*}}/Inputs/addr.exe","Address":"0x40054d","Error":{"Code":0},"Symbol":[ +# INLINE-NEXT:{"FunctionName":"inctwo","StartFileName":"/tmp{{/|\\\\}}x.c","StartLine":2,"FileName":"/tmp{{/|\\\\}}x.c","Line":3,"Column":3} +# INLINE-NEXT:,{"FunctionName":"inc","StartFileName":"/tmp{{/|\\\\}}x.c","StartLine":6,"FileName":"/tmp{{/|\\\\}}x.c","Line":7} +# INLINE-NEXT:,{"FunctionName":"main","StartFileName":"/tmp{{/|\\\\}}x.c","StartLine":12,"FileName":"/tmp{{/|\\\\}}x.c","Line":14}]} + +## Invalid argument after a valid one, inlines. +# INLINE-NEXT:{"ModuleName":"{{.*}}/Inputs/addr.exe","Address":"0x0","Error":{"Code":22,"Message":"unable to parse arguments: some text2"}} + +## Also check the last 3 test cases with llvm-adr2line. The expected result is the same but missing the FunctionName. +# RUN: llvm-addr2line --output-style=JSON -i -e %p/Inputs/addr.exe < %p/Inputs/addr.inp | \ +# RUN: FileCheck %s --check-prefix=INLINE-A2L --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +## Invalid first argument before any valid one, inlines +# INLINE-A2L:{"ModuleName":"{{.*}}/Inputs/addr.exe","Address":"0x0","Error":{"Code":22,"Message":"unable to parse arguments: some text"}} + +## Resolve valid address, inlines. +# INLINE-A2L-NEXT:{"ModuleName":"{{.*}}/Inputs/addr.exe","Address":"0x40054d","Error":{"Code":0},"Symbol":[ +# INLINE-A2L-NEXT:{"StartFileName":"/tmp{{/|\\\\}}x.c","StartLine":2,"FileName":"/tmp{{/|\\\\}}x.c","Line":3,"Column":3} +# INLINE-A2L-NEXT:,{"StartFileName":"/tmp{{/|\\\\}}x.c","StartLine":6,"FileName":"/tmp{{/|\\\\}}x.c","Line":7} +# INLINE-A2L-NEXT:,{"StartFileName":"/tmp{{/|\\\\}}x.c","StartLine":12,"FileName":"/tmp{{/|\\\\}}x.c","Line":14}]} + +## Invalid argument after a valid one, inlines. +# INLINE-A2L-NEXT:{"ModuleName":"{{.*}}/Inputs/addr.exe","Address":"0x0","Error":{"Code":22,"Message":"unable to parse arguments: some text2"}} diff --git a/llvm/test/tools/llvm-symbolizer/output-style-json-data.test b/llvm/test/tools/llvm-symbolizer/output-style-json-data.test new file mode 100644 --- /dev/null +++ b/llvm/test/tools/llvm-symbolizer/output-style-json-data.test @@ -0,0 +1,44 @@ +## This test checks JSON output for DATA. + +# REQUIRES: x86-registered-target + +## Handle symbolize library error - file does not exist. +# RUN: llvm-symbolizer "DATA %t-no-file.o 0" --output-style=JSON | \ +# RUN: FileCheck %s -DMSG=%errc_ENOENT --check-prefix=NO-FILE --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +# NO-FILE:{"ModuleName":"{{.*}}no-file.o","Address":"0x0","Error":{"Code":2,"Message":"[[MSG]]"}} + +## Handle invalid argument. +# RUN: llvm-symbolizer "DATA tmp.o Z" --output-style=JSON | \ +# RUN: FileCheck %s --check-prefix=INVARG --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +# INVARG:{"ModuleName":"tmp.o","Address":"0x0","Error":{"Code":22,"Message":"unable to parse arguments: DATA tmp.o Z"}} + +# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o + +## Resolve out of range address. Only Start and Size is expected. +# RUN: llvm-symbolizer "DATA %t.o 1000000000" --output-style=JSON | \ +# RUN: FileCheck %s --check-prefix=NOT-FOUND --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +# NOT-FOUND:{"ModuleName":"{{.*}}.o","Address":"0x3b9aca00","Error":{"Code":0},"Data":{"Start":"0x0","Size":"0x0"}} + +## Resolve valid address. +# RUN: llvm-symbolizer "DATA %t.o 0" --output-style=JSON | \ +# RUN: FileCheck %s --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +# CHECK:{"ModuleName":"{{.*}}.o","Address":"0x0","Error":{"Code":0},"Data":{"Name":"foo","Start":"0x0","Size":"0x4"}} + +## Test multiple addresses in the command line. +# RUN: llvm-symbolizer -e=%t.o "DATA 0" "DATA 0" --output-style=JSON | \ +# RUN: FileCheck %s --check-prefix=MULTI --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +# MULTI:[{"ModuleName":"{{.*}}.o","Address":"0x0","Error":{"Code":0},"Data":{"Name":"foo","Start":"0x0","Size":"0x4"}} +# MULTI-NEXT:,{"ModuleName":"{{.*}}.o","Address":"0x0","Error":{"Code":0},"Data":{"Name":"foo","Start":"0x0","Size":"0x4"}} +# MULTI-NEXT:] + +.data +.globl foo +.type foo, @object +.size foo, 4 +foo = . + 0x1100000000000000 +.4byte 1 diff --git a/llvm/test/tools/llvm-symbolizer/output-style-json-frame.test b/llvm/test/tools/llvm-symbolizer/output-style-json-frame.test new file mode 100644 --- /dev/null +++ b/llvm/test/tools/llvm-symbolizer/output-style-json-frame.test @@ -0,0 +1,213 @@ +## This test checks JSON output for FRAME. + +# REQUIRES: x86-registered-target + +## Handle symbolize library error - file does not exist. +# RUN: llvm-symbolizer "FRAME %t-no-file.o 0" --output-style=JSON | \ +# RUN: FileCheck %s -DMSG=%errc_ENOENT --check-prefix=NO-FILE --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +# NO-FILE:{"ModuleName":"{{.*}}no-file.o","Address":"0x0","Error":{"Code":2,"Message":"[[MSG]]"}} + +## Handle invalid argument. +# RUN: llvm-symbolizer "FRAME tmp.o Z" --output-style=JSON | \ +# RUN: FileCheck %s --check-prefix=INVARG --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +# INVARG:{"ModuleName":"tmp.o","Address":"0x0","Error":{"Code":22,"Message":"unable to parse arguments: FRAME tmp.o Z"}} + +# RUN: llvm-mc -filetype=obj -triple=i386-linux-gnu -o %t.o %s + +## Resolve out of range address. Expected an empty array. +# RUN: llvm-symbolizer "FRAME %t.o 1000000000" --output-style=JSON | \ +# RUN: FileCheck %s --check-prefix=NOT-FOUND --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +# NOT-FOUND:{"ModuleName":"{{.*}}.o","Address":"0x3b9aca00","Error":{"Code":0},"Frame":[]} + +## Resolve valid address. +# RUN: llvm-symbolizer "FRAME %t.o 0" --output-style=JSON | \ +# RUN: FileCheck %s --strict-whitespace --match-full-lines --implicit-check-not={{.}} + +# CHECK:{"ModuleName":"{{.*}}.o","Address":"0x0","Error":{"Code":0},"Frame":[ +# CHECK-NEXT:{"FunctionName":"f","Name":"a","DeclFile":"/tmp/test{{/|\\\\}}frame.cpp","DeclLine":2,"FrameOffset":-1,"Size":"0x1"} +# CHECK-NEXT:,{"FunctionName":"f","Name":"b","DeclFile":"/tmp/test{{/|\\\\}}frame.cpp","DeclLine":3,"FrameOffset":-8,"Size":"0x4"}]} + +## Generated from: +## +## void f() { +## char a; +## char *b; +## } +## +## clang++ --target=i386-linux-gnu frame.cpp -g -std=c++11 -S -o frame.s + + .text + .file "frame.cpp" + .globl _Z1fv # -- Begin function _Z1fv + .p2align 4, 0x90 + .type _Z1fv,@function +_Z1fv: # @_Z1fv +.Lfunc_begin0: + .file 1 "/tmp/test" "frame.cpp" + .loc 1 1 0 # frame.cpp:1:0 + .cfi_sections .debug_frame + .cfi_startproc +# %bb.0: # %entry + pushl %ebp + .cfi_def_cfa_offset 8 + .cfi_offset %ebp, -8 + movl %esp, %ebp + .cfi_def_cfa_register %ebp +.Ltmp0: + .loc 1 4 1 prologue_end # frame.cpp:4:1 + popl %ebp + .cfi_def_cfa %esp, 4 + retl +.Ltmp1: +.Lfunc_end0: + .size _Z1fv, .Lfunc_end0-_Z1fv + .cfi_endproc + # -- End function + .section .debug_abbrev,"",@progbits + .byte 1 # Abbreviation Code + .byte 17 # DW_TAG_compile_unit + .byte 1 # DW_CHILDREN_yes + .byte 37 # DW_AT_producer + .byte 14 # DW_FORM_strp + .byte 19 # DW_AT_language + .byte 5 # DW_FORM_data2 + .byte 3 # DW_AT_name + .byte 14 # DW_FORM_strp + .byte 16 # DW_AT_stmt_list + .byte 23 # DW_FORM_sec_offset + .byte 27 # DW_AT_comp_dir + .byte 14 # DW_FORM_strp + .byte 17 # DW_AT_low_pc + .byte 1 # DW_FORM_addr + .byte 18 # DW_AT_high_pc + .byte 6 # DW_FORM_data4 + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 2 # Abbreviation Code + .byte 46 # DW_TAG_subprogram + .byte 1 # DW_CHILDREN_yes + .byte 17 # DW_AT_low_pc + .byte 1 # DW_FORM_addr + .byte 18 # DW_AT_high_pc + .byte 6 # DW_FORM_data4 + .byte 64 # DW_AT_frame_base + .byte 24 # DW_FORM_exprloc + .byte 110 # DW_AT_linkage_name + .byte 14 # DW_FORM_strp + .byte 3 # DW_AT_name + .byte 14 # DW_FORM_strp + .byte 58 # DW_AT_decl_file + .byte 11 # DW_FORM_data1 + .byte 59 # DW_AT_decl_line + .byte 11 # DW_FORM_data1 + .byte 63 # DW_AT_external + .byte 25 # DW_FORM_flag_present + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 3 # Abbreviation Code + .byte 52 # DW_TAG_variable + .byte 0 # DW_CHILDREN_no + .byte 2 # DW_AT_location + .byte 24 # DW_FORM_exprloc + .byte 3 # DW_AT_name + .byte 14 # DW_FORM_strp + .byte 58 # DW_AT_decl_file + .byte 11 # DW_FORM_data1 + .byte 59 # DW_AT_decl_line + .byte 11 # DW_FORM_data1 + .byte 73 # DW_AT_type + .byte 19 # DW_FORM_ref4 + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 4 # 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 5 # Abbreviation Code + .byte 15 # DW_TAG_pointer_type + .byte 0 # DW_CHILDREN_no + .byte 73 # DW_AT_type + .byte 19 # DW_FORM_ref4 + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 0 # EOM(3) + .section .debug_info,"",@progbits +.Lcu_begin0: + .long .Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit +.Ldebug_info_start0: + .short 4 # DWARF version number + .long .debug_abbrev # Offset Into Abbrev. Section + .byte 4 # Address Size (in bytes) + .byte 1 # Abbrev [1] 0xb:0x5a DW_TAG_compile_unit + .long .Linfo_string0 # DW_AT_producer + .short 26 # DW_AT_language + .long .Linfo_string1 # DW_AT_name + .long .Lline_table_start0 # DW_AT_stmt_list + .long .Linfo_string2 # DW_AT_comp_dir + .long .Lfunc_begin0 # DW_AT_low_pc + .long .Lfunc_end0-.Lfunc_begin0 # DW_AT_high_pc + .byte 2 # Abbrev [2] 0x26:0x32 DW_TAG_subprogram + .long .Lfunc_begin0 # DW_AT_low_pc + .long .Lfunc_end0-.Lfunc_begin0 # DW_AT_high_pc + .byte 1 # DW_AT_frame_base + .byte 85 + .long .Linfo_string3 # DW_AT_linkage_name + .long .Linfo_string4 # DW_AT_name + .byte 1 # DW_AT_decl_file + .byte 1 # DW_AT_decl_line + # DW_AT_external + .byte 3 # Abbrev [3] 0x3b:0xe DW_TAG_variable + .byte 2 # DW_AT_location + .byte 145 + .byte 127 + .long .Linfo_string5 # DW_AT_name + .byte 1 # DW_AT_decl_file + .byte 2 # DW_AT_decl_line + .long 88 # DW_AT_type + .byte 3 # Abbrev [3] 0x49:0xe DW_TAG_variable + .byte 2 # DW_AT_location + .byte 145 + .byte 120 + .long .Linfo_string7 # DW_AT_name + .byte 1 # DW_AT_decl_file + .byte 3 # DW_AT_decl_line + .long 95 # DW_AT_type + .byte 0 # End Of Children Mark + .byte 4 # Abbrev [4] 0x58:0x7 DW_TAG_base_type + .long .Linfo_string6 # DW_AT_name + .byte 6 # DW_AT_encoding + .byte 1 # DW_AT_byte_size + .byte 5 # Abbrev [5] 0x5f:0x5 DW_TAG_pointer_type + .long 88 # DW_AT_type + .byte 0 # End Of Children Mark +.Ldebug_info_end0: + .section .debug_str,"MS",@progbits,1 +.Linfo_string0: + .asciz "clang version 13.0.0" # string offset=0 +.Linfo_string1: + .asciz "frame.cpp" # string offset=105 +.Linfo_string2: + .asciz "/tmp/test" # string offset=115 +.Linfo_string3: + .asciz "_Z1fv" # string offset=140 +.Linfo_string4: + .asciz "f" # string offset=146 +.Linfo_string5: + .asciz "a" # string offset=148 +.Linfo_string6: + .asciz "char" # string offset=150 +.Linfo_string7: + .asciz "b" # string offset=155 + .addrsig + .section .debug_line,"",@progbits +.Lline_table_start0: diff --git a/llvm/tools/llvm-symbolizer/Opts.td b/llvm/tools/llvm-symbolizer/Opts.td --- a/llvm/tools/llvm-symbolizer/Opts.td +++ b/llvm/tools/llvm-symbolizer/Opts.td @@ -33,9 +33,9 @@ : Eq<"obj", "Path to object file to be symbolized (if not provided, " "object file should be specified for each input line)">, MetaVarName<"">; defm output_style - : Eq<"output-style", "Specify print style. Supported styles: LLVM, GNU">, + : Eq<"output-style", "Specify print style. Supported styles: LLVM, GNU, JSON">, MetaVarName<"style">, - Values<"LLVM,GNU">; + Values<"LLVM,GNU,JSON">; def pretty_print : F<"pretty-print", "Make the output more human friendly">; defm print_source_context_lines : Eq<"print-source-context-lines", "Print N lines of source file context">; def relative_address : F<"relative-address", "Interpret addresses as addresses relative to the image base">; diff --git a/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp b/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp --- a/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp +++ b/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp @@ -95,7 +95,7 @@ Printer.print(Request, T()); } -enum class OutputStyle { LLVM, GNU }; +enum class OutputStyle { LLVM, GNU, JSON }; enum class Command { Code, @@ -324,14 +324,20 @@ auto Style = IsAddr2Line ? OutputStyle::GNU : OutputStyle::LLVM; if (const opt::Arg *A = Args.getLastArg(OPT_output_style_EQ)) { - Style = strcmp(A->getValue(), "GNU") == 0 ? OutputStyle::GNU - : OutputStyle::LLVM; + if (strcmp(A->getValue(), "GNU") == 0) + Style = OutputStyle::GNU; + else if (strcmp(A->getValue(), "JSON") == 0) + Style = OutputStyle::JSON; + else + Style = OutputStyle::LLVM; } LLVMSymbolizer Symbolizer(Opts); std::unique_ptr Printer; if (Style == OutputStyle::GNU) Printer = std::make_unique(outs(), errs(), Config); + else if (Style == OutputStyle::JSON) + Printer = std::make_unique(outs()); else Printer = std::make_unique(outs(), errs(), Config); @@ -350,9 +356,24 @@ outs().flush(); } } else { - for (StringRef Address : InputAddresses) + bool ArrayJSON = false; + if (Style == OutputStyle::JSON && InputAddresses.size() > 1) { + ArrayJSON = true; + outs() << "["; + } + bool ArrayDelimJSON = false; + for (StringRef Address : InputAddresses) { + if (ArrayJSON) { + if (ArrayDelimJSON) + outs() << ","; + else + ArrayDelimJSON = true; + } symbolizeInput(Args, AdjustVMA, IsAddr2Line, Style, Address, Symbolizer, *Printer); + } + if (ArrayJSON) + outs() << "]\n"; } return 0;