[llvm-readobj] Fix JSON output for Relocations

[paulkirth]

Summary

The existing JSON incorrectly outputs line breaks and other invalid JSON.

Example Before this patch:

...
"Relocations":[Section (9) .rela.dyn {
  0xA3B0 R_X86_64_RELATIVE - 0x43D0
  0xA3B8 R_X86_64_RELATIVE - 0x4A30
...

Example After this patch:

...
"Relocations":[Section (9) .rela.dyn {
{"Relocation":{"Offset":41904,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},
"Symbol":{"Value":"","RawValue":0},"Addend":17360}},
{"Relocation":{"Offset":41912,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},
"Symbol":{"Value":"","RawValue":0},"Addend":18992}},
{"Relocation":{"Offset":41920,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},
"Symbol":{"Value":"","RawValue":0},"Addend":17440}},
...

Note there are still issues with the Section, but each Relocation is
now a valid JSON object that can be parsed. Future patches will address
the issues regarding JSON output for the Section.

[jhenderson]

The description of this patch really doesn't provide enough info for me. Please could you a) give an actual example of how the JSON is broken, and b) add some tests to show the behaviour change.

Also, the tag on the patch should be llvm-readobj, since that's the tool name.

[paulkirth]

Today we emit the exact, same text for relocations in both JSON and the LLVM format. The issue is that it isn't valid JSON. In the example below the Section (9) is the first item in the array. But it isnt a key, and isn't an object. To make matters worse, the newlines are hard coded, so even if you don't want pretty printing, you end up with JSON filled with newlines. If you compare the printRelRelaReloc() implementation for the JSONELFDumper and the LLVMELFDumper, you'll see that the JSON one is basically identical to the LLVM style when the expand relocs option is set. While that makes the output more verbose, it's also much more correct, though there are still other issues(like the newlines from the Section printer ...).

Example output:

• Before

[{"FileSummary":{"File":"a.out","Format":"elf64-x86-64","Arch":"x86_64","AddressSize":"64bit","LoadName":"<Not found>"},"Relocations":[Section (9) .rela.dyn {
  0xA3B0 R_X86_64_RELATIVE - 0x43D0
  0xA3B8 R_X86_64_RELATIVE - 0x4A30
  0xA3C0 R_X86_64_RELATIVE - 0x4420
  0xA3C8 R_X86_64_RELATIVE - 0x1622
  0xA3D0 R_X86_64_RELATIVE - 0x16B0
  0xA3D8 R_X86_64_RELATIVE - 0x18A1
  0xA3E0 R_X86_64_RELATIVE - 0x1955
  0xB5D0 R_X86_64_RELATIVE - 0xB5D0
  0xB5D8 R_X86_64_RELATIVE - 0xB8A0
  0xB5E0 R_X86_64_RELATIVE - 0x118A0
  0xB5F0 R_X86_64_RELATIVE - 0x86C0
  0xB5F8 R_X86_64_RELATIVE - 0x7A60
  0xB600 R_X86_64_RELATIVE - 0x7CC0
  0xB608 R_X86_64_RELATIVE - 0x87F0
  0xB610 R_X86_64_RELATIVE - 0x8810
  0xB618 R_X86_64_RELATIVE - 0x8890
  0xB6D8 R_X86_64_RELATIVE - 0x4490
  0xB708 R_X86_64_RELATIVE - 0x4730
  0xB738 R_X86_64_RELATIVE - 0x4760
  0xB768 R_X86_64_RELATIVE - 0x4790
  0xB798 R_X86_64_RELATIVE - 0x47C0
  0xB7C8 R_X86_64_RELATIVE - 0x4860
  0xB7F8 R_X86_64_RELATIVE - 0x4900
  0xB828 R_X86_64_RELATIVE - 0x49C0
  0xB858 R_X86_64_RELATIVE - 0x49E0
  0xB888 R_X86_64_RELATIVE - 0x4A00
  0xA588 R_X86_64_GLOB_DAT __libc_start_main@GLIBC_2.34 0x0
  0xA590 R_X86_64_GLOB_DAT __gmon_start__ 0x0
  0xA598 R_X86_64_GLOB_DAT __register_frame_info 0x0
  0xA5A0 R_X86_64_GLOB_DAT __cxa_finalize@GLIBC_2.2.5 0x0
  0xA5A8 R_X86_64_GLOB_DAT __deregister_frame_info 0x0
  0xA5B0 R_X86_64_GLOB_DAT free@GLIBC_2.2.5 0x0
  0xA5B8 R_X86_64_GLOB_DAT stderr@GLIBC_2.2.5 0x0
}
Section (10) .rela.plt {
  0x118B8 R_X86_64_JUMP_SLOT __register_frame_info 0x0
  0x118C0 R_X86_64_JUMP_SLOT __cxa_finalize@GLIBC_2.2.5 0x0
  0x118C8 R_X86_64_JUMP_SLOT __deregister_frame_info 0x0
  0x118D0 R_X86_64_JUMP_SLOT strlen@GLIBC_2.2.5 0x0
  0x118D8 R_X86_64_JUMP_SLOT rand@GLIBC_2.2.5 0x0
  0x118E0 R_X86_64_JUMP_SLOT printf@GLIBC_2.2.5 0x0
  0x118E8 R_X86_64_JUMP_SLOT free@GLIBC_2.2.5 0x0
  0x118F0 R_X86_64_JUMP_SLOT calloc@GLIBC_2.2.5 0x0
  0x118F8 R_X86_64_JUMP_SLOT malloc@GLIBC_2.2.5 0x0
  0x11900 R_X86_64_JUMP_SLOT memcpy@GLIBC_2.14 0x0
  0x11908 R_X86_64_JUMP_SLOT fprintf@GLIBC_2.2.5 0x0
  0x11910 R_X86_64_JUMP_SLOT getpid@GLIBC_2.2.5 0x0
  0x11918 R_X86_64_JUMP_SLOT snprintf@GLIBC_2.2.5 0x0
  0x11920 R_X86_64_JUMP_SLOT getenv@GLIBC_2.2.5 0x0
  0x11928 R_X86_64_JUMP_SLOT strcmp@GLIBC_2.2.5 0x0
  0x11930 R_X86_64_JUMP_SLOT __strdup@GLIBC_2.2.5 0x0
  0x11938 R_X86_64_JUMP_SLOT getpagesize@GLIBC_2.2.5 0x0
  0x11940 R_X86_64_JUMP_SLOT __errno_location@GLIBC_2.2.5 0x0
  0x11948 R_X86_64_JUMP_SLOT strerror@GLIBC_2.2.5 0x0
  0x11950 R_X86_64_JUMP_SLOT fopen@GLIBC_2.2.5 0x0
  0x11958 R_X86_64_JUMP_SLOT fileno@GLIBC_2.2.5 0x0
  0x11960 R_X86_64_JUMP_SLOT ftruncate@GLIBC_2.2.5 0x0
  0x11968 R_X86_64_JUMP_SLOT munmap@GLIBC_2.2.5 0x0
  0x11970 R_X86_64_JUMP_SLOT fseek@GLIBC_2.2.5 0x0
  0x11978 R_X86_64_JUMP_SLOT strtol@GLIBC_2.2.5 0x0
  0x11980 R_X86_64_JUMP_SLOT fclose@GLIBC_2.2.5 0x0
  0x11988 R_X86_64_JUMP_SLOT fflush@GLIBC_2.2.5 0x0
  0x11990 R_X86_64_JUMP_SLOT fwrite@GLIBC_2.2.5 0x0
  0x11998 R_X86_64_JUMP_SLOT ftell@GLIBC_2.2.5 0x0
  0x119A0 R_X86_64_JUMP_SLOT mmap@GLIBC_2.2.5 0x0
  0x119A8 R_X86_64_JUMP_SLOT setenv@GLIBC_2.2.5 0x0
  0x119B0 R_X86_64_JUMP_SLOT strncpy@GLIBC_2.2.5 0x0
  0x119B8 R_X86_64_JUMP_SLOT memset@GLIBC_2.2.5 0x0
  0x119C0 R_X86_64_JUMP_SLOT mkdir@GLIBC_2.2.5 0x0
  0x119C8 R_X86_64_JUMP_SLOT uname@GLIBC_2.2.5 0x0
  0x119D0 R_X86_64_JUMP_SLOT fcntl@GLIBC_2.2.5 0x0
  0x119D8 R_X86_64_JUMP_SLOT open@GLIBC_2.2.5 0x0
  0x119E0 R_X86_64_JUMP_SLOT fdopen@GLIBC_2.2.5 0x0
  0x119E8 R_X86_64_JUMP_SLOT strchr@GLIBC_2.2.5 0x0
  0x119F0 R_X86_64_JUMP_SLOT strrchr@GLIBC_2.2.5 0x0
  0x119F8 R_X86_64_JUMP_SLOT prctl@GLIBC_2.2.5 0x0
  0x11A00 R_X86_64_JUMP_SLOT madvise@GLIBC_2.2.5 0x0
  0x11A08 R_X86_64_JUMP_SLOT __cxa_atexit@GLIBC_2.2.5 0x0
}
]}]

• After

[{"FileSummary":{"File":"a.out","Format":"elf64-x86-64","Arch":"x86_64","AddressSize":"64bit","LoadName":"<Not found>"},"Relocations":[Section (9) .rela.dyn {
{"Relocation":{"Offset":41904,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":17360}},{"Relocation":{"Offset":41912,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":18992}},{"Relocation":{"Offset":41920,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":17440}},{"Relocation":{"Offset":41928,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":5666}},{"Relocation":{"Offset":41936,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":5808}},{"Relocation":{"Offset":41944,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":6305}},{"Relocation":{"Offset":41952,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":6485}},{"Relocation":{"Offset":46544,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":46544}},{"Relocation":{"Offset":46552,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":47264}},{"Relocation":{"Offset":46560,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":71840}},{"Relocation":{"Offset":46576,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":34496}},{"Relocation":{"Offset":46584,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":31328}},{"Relocation":{"Offset":46592,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":31936}},{"Relocation":{"Offset":46600,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":34800}},{"Relocation":{"Offset":46608,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":34832}},{"Relocation":{"Offset":46616,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":34960}},{"Relocation":{"Offset":46808,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":17552}},{"Relocation":{"Offset":46856,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":18224}},{"Relocation":{"Offset":46904,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":18272}},{"Relocation":{"Offset":46952,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":18320}},{"Relocation":{"Offset":47000,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":18368}},{"Relocation":{"Offset":47048,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":18528}},{"Relocation":{"Offset":47096,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":18688}},{"Relocation":{"Offset":47144,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":18880}},{"Relocation":{"Offset":47192,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":18912}},{"Relocation":{"Offset":47240,"Type":{"Value":"R_X86_64_RELATIVE","RawValue":8},"Symbol":{"Value":"","RawValue":0},"Addend":18944}},{"Relocation":{"Offset":42376,"Type":{"Value":"R_X86_64_GLOB_DAT","RawValue":6},"Symbol":{"Value":"__libc_start_main@GLIBC_2.34","RawValue":1},"Addend":0}},{"Relocation":{"Offset":42384,"Type":{"Value":"R_X86_64_GLOB_DAT","RawValue":6},"Symbol":{"Value":"__gmon_start__","RawValue":2},"Addend":0}},{"Relocation":{"Offset":42392,"Type":{"Value":"R_X86_64_GLOB_DAT","RawValue":6},"Symbol":{"Value":"__register_frame_info","RawValue":3},"Addend":0}},{"Relocation":{"Offset":42400,"Type":{"Value":"R_X86_64_GLOB_DAT","RawValue":6},"Symbol":{"Value":"__cxa_finalize@GLIBC_2.2.5","RawValue":4},"Addend":0}},{"Relocation":{"Offset":42408,"Type":{"Value":"R_X86_64_GLOB_DAT","RawValue":6},"Symbol":{"Value":"__deregister_frame_info","RawValue":5},"Addend":0}},{"Relocation":{"Offset":42416,"Type":{"Value":"R_X86_64_GLOB_DAT","RawValue":6},"Symbol":{"Value":"free@GLIBC_2.2.5","RawValue":9},"Addend":0}},{"Relocation":{"Offset":42424,"Type":{"Value":"R_X86_64_GLOB_DAT","RawValue":6},"Symbol":{"Value":"stderr@GLIBC_2.2.5","RawValue":13},"Addend":0}}}
Section (10) .rela.plt {
,{"Relocation":{"Offset":71864,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"__register_frame_info","RawValue":3},"Addend":0}},{"Relocation":{"Offset":71872,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"__cxa_finalize@GLIBC_2.2.5","RawValue":4},"Addend":0}},{"Relocation":{"Offset":71880,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"__deregister_frame_info","RawValue":5},"Addend":0}},{"Relocation":{"Offset":71888,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"strlen@GLIBC_2.2.5","RawValue":6},"Addend":0}},{"Relocation":{"Offset":71896,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"rand@GLIBC_2.2.5","RawValue":7},"Addend":0}},{"Relocation":{"Offset":71904,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"printf@GLIBC_2.2.5","RawValue":8},"Addend":0}},{"Relocation":{"Offset":71912,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"free@GLIBC_2.2.5","RawValue":9},"Addend":0}},{"Relocation":{"Offset":71920,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"calloc@GLIBC_2.2.5","RawValue":10},"Addend":0}},{"Relocation":{"Offset":71928,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"malloc@GLIBC_2.2.5","RawValue":11},"Addend":0}},{"Relocation":{"Offset":71936,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"memcpy@GLIBC_2.14","RawValue":12},"Addend":0}},{"Relocation":{"Offset":71944,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"fprintf@GLIBC_2.2.5","RawValue":14},"Addend":0}},{"Relocation":{"Offset":71952,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"getpid@GLIBC_2.2.5","RawValue":15},"Addend":0}},{"Relocation":{"Offset":71960,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"snprintf@GLIBC_2.2.5","RawValue":16},"Addend":0}},{"Relocation":{"Offset":71968,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"getenv@GLIBC_2.2.5","RawValue":17},"Addend":0}},{"Relocation":{"Offset":71976,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"strcmp@GLIBC_2.2.5","RawValue":18},"Addend":0}},{"Relocation":{"Offset":71984,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"__strdup@GLIBC_2.2.5","RawValue":19},"Addend":0}},{"Relocation":{"Offset":71992,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"getpagesize@GLIBC_2.2.5","RawValue":20},"Addend":0}},{"Relocation":{"Offset":72000,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"__errno_location@GLIBC_2.2.5","RawValue":21},"Addend":0}},{"Relocation":{"Offset":72008,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"strerror@GLIBC_2.2.5","RawValue":22},"Addend":0}},{"Relocation":{"Offset":72016,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"fopen@GLIBC_2.2.5","RawValue":23},"Addend":0}},{"Relocation":{"Offset":72024,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"fileno@GLIBC_2.2.5","RawValue":24},"Addend":0}},{"Relocation":{"Offset":72032,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"ftruncate@GLIBC_2.2.5","RawValue":25},"Addend":0}},{"Relocation":{"Offset":72040,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"munmap@GLIBC_2.2.5","RawValue":26},"Addend":0}},{"Relocation":{"Offset":72048,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"fseek@GLIBC_2.2.5","RawValue":27},"Addend":0}},{"Relocation":{"Offset":72056,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"strtol@GLIBC_2.2.5","RawValue":28},"Addend":0}},{"Relocation":{"Offset":72064,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"fclose@GLIBC_2.2.5","RawValue":29},"Addend":0}},{"Relocation":{"Offset":72072,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"fflush@GLIBC_2.2.5","RawValue":30},"Addend":0}},{"Relocation":{"Offset":72080,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"fwrite@GLIBC_2.2.5","RawValue":31},"Addend":0}},{"Relocation":{"Offset":72088,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"ftell@GLIBC_2.2.5","RawValue":32},"Addend":0}},{"Relocation":{"Offset":72096,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"mmap@GLIBC_2.2.5","RawValue":33},"Addend":0}},{"Relocation":{"Offset":72104,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"setenv@GLIBC_2.2.5","RawValue":34},"Addend":0}},{"Relocation":{"Offset":72112,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"strncpy@GLIBC_2.2.5","RawValue":35},"Addend":0}},{"Relocation":{"Offset":72120,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"memset@GLIBC_2.2.5","RawValue":36},"Addend":0}},{"Relocation":{"Offset":72128,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"mkdir@GLIBC_2.2.5","RawValue":37},"Addend":0}},{"Relocation":{"Offset":72136,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"uname@GLIBC_2.2.5","RawValue":38},"Addend":0}},{"Relocation":{"Offset":72144,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"fcntl@GLIBC_2.2.5","RawValue":39},"Addend":0}},{"Relocation":{"Offset":72152,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"open@GLIBC_2.2.5","RawValue":40},"Addend":0}},{"Relocation":{"Offset":72160,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"fdopen@GLIBC_2.2.5","RawValue":41},"Addend":0}},{"Relocation":{"Offset":72168,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"strchr@GLIBC_2.2.5","RawValue":42},"Addend":0}},{"Relocation":{"Offset":72176,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"strrchr@GLIBC_2.2.5","RawValue":43},"Addend":0}},{"Relocation":{"Offset":72184,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"prctl@GLIBC_2.2.5","RawValue":44},"Addend":0}},{"Relocation":{"Offset":72192,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"madvise@GLIBC_2.2.5","RawValue":45},"Addend":0}},{"Relocation":{"Offset":72200,"Type":{"Value":"R_X86_64_JUMP_SLOT","RawValue":7},"Symbol":{"Value":"__cxa_atexit@GLIBC_2.2.5","RawValue":46},"Addend":0}}}
]}]%

[paulkirth]

Rebase and update summary with example

[jhenderson]

Thanks for the explanation. With the examples, I see your problem.

Unfortunately, I don't have the time to review this properly today (plus it needs tests anyway to show that the code behaves as expected), and as noted elsewhere, I'm away for 6 weeks after today, so it'll be late January or even February before I get as far as reviewing this. Hopefully somebody else can pick this up (@MaskRay?).

[paulkirth]

• Avoid code duplication using smaller helper functions
• Simplify testing

[paulkirth]

Fix Formatting

[paulkirth]

Rebase

[paulkirth]

Rebase

[paulkirth]

Rebase.

[paulkirth]

Rebase.

[jhenderson]

As with the previous patch, I'd look at modifying https://github.com/llvm/llvm-project/blob/main/llvm/test/tools/llvm-readobj/ELF/relocations.test (and possibly other tests if that test doesn't provide sufficient coverage). Otherwise, this looks reasonable to me.

[paulkirth]

Rebase and address comments.

• update test code w/ JSON sections

[jhenderson]

I think you may have misinterpreted my previous comments about testing a little. I don't think you need to test all the details that you are now testing in this patch. In particular, the error cases are from common code, and don't really need testing for JSON, I'd have thought (you may have one test for error behaviour, to show the error message is not part of the JSON format, if you want, I guess). It's probably sufficient to show that relocations are printed in "expanded" form, whether or not --expand-relocs is used for JSON output. Up to you, but I'm not convinced you even need to test the 32-bit versus 64-bit differences.

llvm/test/tools/llvm-readobj/ELF/relocations.test

12

Nit: please don't add this extra blank line.

113

392–393

Nit: only one blank line please.

422

Nit: only one blank line please.

469

557

Ditto.

[paulkirth]

Remove extranious testing for common code, and reduce reduncancy.

• Remove extra lines.

[paulkirth]

I think this patchset is more what you had in mind w.r.t. testing, but please let me know if I've swung back too far in the other direction.

[paulkirth]

Fix typo in RUN line

[paulkirth]

Remove JSON test for warnings since it doesn't add much. Later changes will
also make the JSON output around the warning slightly different, so its better
to avoid it altogether.

[paulkirth]

Rebase

[jhenderson]

LGTM, with some nits.

llvm/test/tools/llvm-readobj/ELF/relocations.test

113

Nit isn't fully addressed (missing full stop at end of comment).

llvm/tools/llvm-readobj/ELFDumper.cpp

6759–6760

Do these really make sense as const? I'm pretty sure StringRef isn't usually a const since you can't modify the string.

6771

Ditto.

[paulkirth]

Address comments.

• Add missing . in test.
• Remove const qualifier from StringRef.

[paulkirth]

Rebase

llvm/test/tools/llvm-readobj/ELF/relocations.test

 ## Check llvm-readobj and llvm-readelf print relocations as expected.
 
 ## Show that ELF64 is dumped correctly.
 # RUN: yaml2obj %s --docnum=1 -o %t64
 # RUN: llvm-readobj -r %t64 \
 # RUN:   | FileCheck %s --check-prefix=LLVM-64 --strict-whitespace --match-full-lines
 # RUN: llvm-readobj --relocs %t64 \
 # RUN:   | FileCheck %s --check-prefix=LLVM-64 --strict-whitespace --match-full-lines
 # RUN: llvm-readobj --relocations %t64 \
 # RUN:   | FileCheck %s --check-prefix=LLVM-64 --strict-whitespace --match-full-lines
 
 #      LLVM-64:Relocations [
 # LLVM-64-NEXT:  Section (2) .rel.text {
 # LLVM-64-NEXT:    0x0 R_X86_64_NONE rel_0
 # LLVM-64-NEXT:    0x1 R_X86_64_PC32 rel_neg
 # LLVM-64-NEXT:    0x5 R_X86_64_PLT32 rel_pos
 # LLVM-64-NEXT:    0x9 R_X86_64_64 rel_64
 # LLVM-64-NEXT:  }
 # LLVM-64-NEXT:  Section (3) .rela.text {
 # LLVM-64-NEXT:    0x0 R_X86_64_NONE rela_0 0x0

 # GNU-64-NEXT:Relocation section '.rela.text' at offset 0x91 contains 5 entries:
 # GNU-64-NEXT:    Offset             Info             Type               Symbol's Value  Symbol's Name + Addend
 # GNU-64-NEXT:0000000000000000  0000000500000000 R_X86_64_NONE          0000000000000000 rela_0 + 0
 # GNU-64-NEXT:0000000000000001  0000000600000002 R_X86_64_PC32          0000000000000001 rela_neg - 1
 # GNU-64-NEXT:0000000000000005  0000000700000004 R_X86_64_PLT32         0000000000000002 rela_pos + 2
 # GNU-64-NEXT:ffffffffffffffff  0000000800000001 R_X86_64_64            0000000000000003 rela_minneg - 8000000000000000
 # GNU-64-NEXT:0000000000000009  000000090000000b R_X86_64_32S           ffffffffffffffff rela_maxpos + 7fffffffffffffff
 
-## Show that --expand-relocs expands the relocation dump for LLVM style only
-## (and not GNU).
+## Show that --expand-relocs expands the relocation dump for LLVM style and not GNU.
 # RUN: llvm-readobj -r --expand-relocs %t64 \
 # RUN:   | FileCheck %s --check-prefix=LLVM-EXPAND-64 --match-full-lines --strict-whitespace
 # RUN: llvm-readelf -r --expand-relocs %t64 \
 # RUN:   | FileCheck %s --check-prefix=GNU-64 --match-full-lines --strict-whitespace
 
 #      LLVM-EXPAND-64:Relocations [
 # LLVM-EXPAND-64-NEXT:  Section (2) .rel.text {
 # LLVM-EXPAND-64-NEXT:    Relocation {

 # LLVM-EXPAND-64-NEXT:      Offset: 0x9
 # LLVM-EXPAND-64-NEXT:      Type: R_X86_64_32S (11)
 # LLVM-EXPAND-64-NEXT:      Symbol: rela_maxpos (9)
 # LLVM-EXPAND-64-NEXT:      Addend: 0x7FFFFFFFFFFFFFFF
 # LLVM-EXPAND-64-NEXT:    }
 # LLVM-EXPAND-64-NEXT:  }
 # LLVM-EXPAND-64-NEXT:]
 
+## Show that JSON relocations are always expanded.
+# RUN: llvm-readobj -r %t64 --elf-output-style=JSON --pretty-print \
+# RUN:   | FileCheck %s --check-prefix=JSON-EXPAND-64
+# RUN: llvm-readobj -r --expand-relocs %t64 --elf-output-style=JSON --pretty-print \
+# RUN:   | FileCheck %s --check-prefix=JSON-EXPAND-64
+
+# JSON-EXPAND-64:      "Relocations": [Section (2) .rel.text {
+# JSON-EXPAND-64:        "Relocation": {
+# JSON-EXPAND-64-NEXT:     "Offset": 0,
+# JSON-EXPAND-64-NEXT:     "Type": {
+# JSON-EXPAND-64-NEXT:       "Value": "R_X86_64_NONE",
+# JSON-EXPAND-64-NEXT:       "RawValue": 0
+# JSON-EXPAND-64-NEXT:     },
+# JSON-EXPAND-64-NEXT:     "Symbol": {
+# JSON-EXPAND-64-NEXT:       "Value": "rel_0",
+# JSON-EXPAND-64-NEXT:       "RawValue": 1
+# JSON-EXPAND-64-NEXT:     }
+# JSON-EXPAND-64-NEXT:   }
+# JSON-EXPAND-64-NEXT: },
+# JSON-EXPAND-64-NEXT: {
+# JSON-EXPAND-64-NEXT:   "Relocation": {
+# JSON-EXPAND-64-NEXT:     "Offset": 1,
+# JSON-EXPAND-64-NEXT:     "Type": {
+# JSON-EXPAND-64-NEXT:       "Value": "R_X86_64_PC32",
+# JSON-EXPAND-64-NEXT:       "RawValue": 2
+# JSON-EXPAND-64-NEXT:     },
+# JSON-EXPAND-64-NEXT:     "Symbol": {
+# JSON-EXPAND-64-NEXT:       "Value": "rel_neg",
+# JSON-EXPAND-64-NEXT:       "RawValue": 2
+# JSON-EXPAND-64-NEXT:     }
+# JSON-EXPAND-64-NEXT:   }
+# JSON-EXPAND-64-NEXT: },
+# JSON-EXPAND-64-NEXT: {
+# JSON-EXPAND-64-NEXT:   "Relocation": {
+# JSON-EXPAND-64-NEXT:     "Offset": 5,
+# JSON-EXPAND-64-NEXT:     "Type": {
+# JSON-EXPAND-64-NEXT:       "Value": "R_X86_64_PLT32",
+# JSON-EXPAND-64-NEXT:       "RawValue": 4
+# JSON-EXPAND-64-NEXT:     },
+# JSON-EXPAND-64-NEXT:     "Symbol": {
+# JSON-EXPAND-64-NEXT:       "Value": "rel_pos",
+# JSON-EXPAND-64-NEXT:       "RawValue": 3
+# JSON-EXPAND-64-NEXT:     }
+# JSON-EXPAND-64-NEXT:   }
+# JSON-EXPAND-64-NEXT: },
+# JSON-EXPAND-64-NEXT: {
+# JSON-EXPAND-64-NEXT:   "Relocation": {
+# JSON-EXPAND-64-NEXT:     "Offset": 9,
+# JSON-EXPAND-64-NEXT:     "Type": {
+# JSON-EXPAND-64-NEXT:       "Value": "R_X86_64_64",
+# JSON-EXPAND-64-NEXT:       "RawValue": 1
+# JSON-EXPAND-64-NEXT:     },
+# JSON-EXPAND-64-NEXT:     "Symbol": {
+# JSON-EXPAND-64-NEXT:       "Value": "rel_64",
+# JSON-EXPAND-64-NEXT:       "RawValue": 4
+# JSON-EXPAND-64-NEXT:     }
+# JSON-EXPAND-64-NEXT:   }
+# JSON-EXPAND-64-NEXT: }}
+# JSON-EXPAND-64-NEXT: Section (3) .rela.text {
+# JSON-EXPAND-64-NEXT: ,
+# JSON-EXPAND-64-NEXT: {
+# JSON-EXPAND-64-NEXT:   "Relocation": {
+# JSON-EXPAND-64-NEXT:     "Offset": 0,
+# JSON-EXPAND-64-NEXT:     "Type": {
+# JSON-EXPAND-64-NEXT:       "Value": "R_X86_64_NONE",
+# JSON-EXPAND-64-NEXT:       "RawValue": 0
+# JSON-EXPAND-64-NEXT:     },
+# JSON-EXPAND-64-NEXT:     "Symbol": {
+# JSON-EXPAND-64-NEXT:       "Value": "rela_0",
+# JSON-EXPAND-64-NEXT:       "RawValue": 5
+# JSON-EXPAND-64-NEXT:     },
+# JSON-EXPAND-64-NEXT:     "Addend": 0
+# JSON-EXPAND-64-NEXT:   }
+# JSON-EXPAND-64-NEXT: },
+# JSON-EXPAND-64-NEXT: {
+# JSON-EXPAND-64-NEXT:   "Relocation": {
+# JSON-EXPAND-64-NEXT:     "Offset": 1,
+# JSON-EXPAND-64-NEXT:     "Type": {
+# JSON-EXPAND-64-NEXT:       "Value": "R_X86_64_PC32",
+# JSON-EXPAND-64-NEXT:       "RawValue": 2
+# JSON-EXPAND-64-NEXT:     },
+# JSON-EXPAND-64-NEXT:     "Symbol": {
+# JSON-EXPAND-64-NEXT:       "Value": "rela_neg",
+# JSON-EXPAND-64-NEXT:       "RawValue": 6
+# JSON-EXPAND-64-NEXT:     },
+# JSON-EXPAND-64-NEXT:     "Addend": 18446744073709551615
+# JSON-EXPAND-64-NEXT:   }
+# JSON-EXPAND-64-NEXT: },
+# JSON-EXPAND-64-NEXT: {
+# JSON-EXPAND-64-NEXT:   "Relocation": {
+# JSON-EXPAND-64-NEXT:     "Offset": 5,
+# JSON-EXPAND-64-NEXT:     "Type": {
+# JSON-EXPAND-64-NEXT:       "Value": "R_X86_64_PLT32",
+# JSON-EXPAND-64-NEXT:       "RawValue": 4
+# JSON-EXPAND-64-NEXT:     },
+# JSON-EXPAND-64-NEXT:     "Symbol": {
+# JSON-EXPAND-64-NEXT:       "Value": "rela_pos",
+# JSON-EXPAND-64-NEXT:       "RawValue": 7
+# JSON-EXPAND-64-NEXT:     },
+# JSON-EXPAND-64-NEXT:     "Addend": 2
+# JSON-EXPAND-64-NEXT:   }
+# JSON-EXPAND-64-NEXT: },
+# JSON-EXPAND-64-NEXT: {
+# JSON-EXPAND-64-NEXT:   "Relocation": {
+# JSON-EXPAND-64-NEXT:     "Offset": 18446744073709551615,
+# JSON-EXPAND-64-NEXT:     "Type": {
+# JSON-EXPAND-64-NEXT:       "Value": "R_X86_64_64",
+# JSON-EXPAND-64-NEXT:       "RawValue": 1
+# JSON-EXPAND-64-NEXT:     },
+# JSON-EXPAND-64-NEXT:     "Symbol": {
+# JSON-EXPAND-64-NEXT:       "Value": "rela_minneg",
+# JSON-EXPAND-64-NEXT:       "RawValue": 8
+# JSON-EXPAND-64-NEXT:     },
+# JSON-EXPAND-64-NEXT:     "Addend": 9223372036854775808
+# JSON-EXPAND-64-NEXT:   }
+# JSON-EXPAND-64-NEXT: },
+# JSON-EXPAND-64-NEXT: {
+# JSON-EXPAND-64-NEXT:   "Relocation": {
+# JSON-EXPAND-64-NEXT:     "Offset": 9,
+# JSON-EXPAND-64-NEXT:     "Type": {
+# JSON-EXPAND-64-NEXT:       "Value": "R_X86_64_32S",
+# JSON-EXPAND-64-NEXT:       "RawValue": 11
+# JSON-EXPAND-64-NEXT:     },
+# JSON-EXPAND-64-NEXT:     "Symbol": {
+# JSON-EXPAND-64-NEXT:       "Value": "rela_maxpos",
+# JSON-EXPAND-64-NEXT:       "RawValue": 9
+# JSON-EXPAND-64-NEXT:     },
+# JSON-EXPAND-64-NEXT:     "Addend": 9223372036854775807
+# JSON-EXPAND-64-NEXT:   }
+# JSON-EXPAND-64-NEXT: }}
+
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_X86_64
 Sections:
   - Name: .text

 # BROKEN-RELA-GNU-NEXT: 0000000000000000  0000000100000000 R_X86_64_NONE  0000000000000000 rel_0
 # BROKEN-RELA-GNU-NEXT: 0000000000000001  0000000200000002 R_X86_64_PC32  0000000000000001 rel_neg
 # BROKEN-RELA-GNU-NEXT: 0000000000000005  0000000300000004 R_X86_64_PLT32 0000000000000002 rel_pos
 # BROKEN-RELA-GNU-NEXT: 0000000000000009  0000000400000001 R_X86_64_64    ffffffffffffffff rel_64
 # BROKEN-RELA-GNU-EMPTY:
 # BROKEN-RELA-GNU-NEXT: Relocation section '.rela.text' at offset 0x91 contains 120 entries:
 # BROKEN-RELA-GNU-NEXT:     Offset             Info             Type               Symbol's Value  Symbol's Name + Addend
 # BROKEN-RELA-GNU-NEXT: warning: '[[FILE]]': unable to read relocations from SHT_RELA section with index 3: section [index 3] has invalid sh_entsize: expected 24, but got 1
 
 ## Case C: check the case when relocations can't be read from SHT_REL/SHT_RELA sections
 ##         because of broken sh_link fields.
 # RUN: yaml2obj %s --docnum=1 -DLINK=0xffff -o %t.broken.link
 # RUN: llvm-readobj --relocations %t.broken.link 2>&1 \
 # RUN:   | FileCheck %s -DFILE=%t.broken.link --check-prefix=BROKEN-LINK-LLVM
 # RUN: llvm-readelf --relocations %t.broken.link 2>&1 \
 # RUN:   | FileCheck %s -DFILE=%t.broken.link --check-prefix=BROKEN-LINK-GNU
 
 # BROKEN-LINK-LLVM:      Relocations [

 # BROKEN-LINK-GNU-NEXT: Relocation section '.rela.text' at offset 0x91 contains 5 entries:
 # BROKEN-LINK-GNU-NEXT:     Offset             Info             Type               Symbol's Value  Symbol's Name + Addend
 # BROKEN-LINK-GNU-NEXT: warning: '[[FILE]]': unable to locate a symbol table for SHT_RELA section with index 3: invalid section index: 65535
 
 ## Show that ELF32 is dumped correctly.
 # RUN: yaml2obj %s --docnum=2 -o %t32
 # RUN: llvm-readobj -r %t32 \
 # RUN:   | FileCheck %s --check-prefix=LLVM-32 --strict-whitespace --match-full-lines
 # RUN: llvm-readobj --relocs %t32 \
 # RUN:   | FileCheck %s --check-prefix=LLVM-32 --strict-whitespace --match-full-lines
 # RUN: llvm-readobj --relocations %t32 \
 # RUN:   | FileCheck %s --check-prefix=LLVM-32 --strict-whitespace --match-full-lines
 
 #      LLVM-32:Relocations [
 # LLVM-32-NEXT:  Section (2) .rel.text {
 # LLVM-32-NEXT:    0x0 R_386_NONE rel_0
 # LLVM-32-NEXT:    0x1 R_386_PC32 rel_neg

 # GNU-32-NEXT:Relocation section '.rela.text' at offset 0x55 contains 5 entries:
 # GNU-32-NEXT: Offset     Info    Type                Sym. Value  Symbol's Name + Addend
 # GNU-32-NEXT:00000000  00000400 R_386_NONE             00000000   rela_0 + 0
 # GNU-32-NEXT:00000001  00000502 R_386_PC32             00000001   rela_neg - 1
 # GNU-32-NEXT:00000005  00000604 R_386_PLT32            00000002   rela_pos + 2
 # GNU-32-NEXT:ffffffff  00000701 R_386_32               00000003   rela_minneg - 80000000
 # GNU-32-NEXT:00000009  00000803 R_386_GOT32            ffffffff   rela_maxpos + 7fffffff
 
-## Show that --expand-relocs expands the relocation dump for LLVM style only
-## (and not GNU).
+## Show that --expand-relocs expands the relocation dump for LLVM style and not GNU.
 # RUN: llvm-readobj -r --expand-relocs %t32 \
 # RUN:   | FileCheck %s --check-prefix=LLVM-EXPAND-32 --strict-whitespace --match-full-lines
 # RUN: llvm-readelf -r --expand-relocs %t32 \
 # RUN:   | FileCheck %s --check-prefix=GNU-32 --strict-whitespace --match-full-lines
 
 #      LLVM-EXPAND-32:Relocations [
 # LLVM-EXPAND-32-NEXT:  Section (2) .rel.text {
 # LLVM-EXPAND-32-NEXT:    Relocation {
 # LLVM-EXPAND-32-NEXT:      Offset: 0x0
 # LLVM-EXPAND-32-NEXT:      Type: R_386_NONE (0)
 # LLVM-EXPAND-32-NEXT:      Symbol: rel_0 (1)
 # LLVM-EXPAND-32-NEXT:    }
 # LLVM-EXPAND-32-NEXT:    Relocation {
 # LLVM-EXPAND-32-NEXT:      Offset: 0x1
Relocations:
         Addend: 0
       - Offset: 0x1
         Symbol: rela_neg
         Type:   R_386_PC32
         Addend: -1
       - Offset: 0x5
         Symbol: rela_pos
         Type:   R_386_PLT32
         Addend: 2
       - Offset: 0xFFFFFFFF
         Symbol: rela_minneg
         Type:   R_386_32
         Addend: -2147483648 ## Min 32-bit signed.
       - Offset: 0x9
         Symbol: rela_maxpos
         Type:   R_386_GOT32
         Addend: 2147483647 ## Max 32-bit signed.

llvm/tools/llvm-readobj/ELFDumper.cpp

private:
 
   void printMipsGOT(const MipsGOTParser<ELFT> &Parser) override;
   void printMipsPLT(const MipsGOTParser<ELFT> &Parser) override;
   void printMipsABIFlags() override;
   virtual void printZeroSymbolOtherField(const Elf_Sym &Symbol) const;
 
 protected:
   void printSymbolOtherField(const Elf_Sym &Symbol) const;
+  virtual void printExpandedRelRelaReloc(const Relocation<ELFT> &R,
+                                         StringRef SymbolName,
+                                         StringRef RelocName);
+  virtual void printDefaultRelRelaReloc(const Relocation<ELFT> &R,
+                                        StringRef SymbolName,
+                                        StringRef RelocName);
+
   ScopedPrinter &W;
 };
 
 // JSONELFDumper shares most of the same implementation as LLVMELFDumper except
 // it uses a JSONScopedPrinter.
 template <typename ELFT> class JSONELFDumper : public LLVMELFDumper<ELFT> {
 public:
   LLVM_ELF_IMPORT_TYPES_ELFT(ELFT)
 
   JSONELFDumper(const object::ELFObjectFile<ELFT> &ObjF, ScopedPrinter &Writer)
       : LLVMELFDumper<ELFT>(ObjF, Writer) {}
 
   void printFileSummary(StringRef FileStr, ObjectFile &Obj,
                         ArrayRef<std::string> InputFilenames,
                         const Archive *A) override;
   virtual void printZeroSymbolOtherField(const Elf_Sym &Symbol) const override;
 
+  void printDefaultRelRelaReloc(const Relocation<ELFT> &R,
+                                StringRef SymbolName,
+                                StringRef RelocName) override;
+
 private:
   std::unique_ptr<DictScope> FileScope;
 };
 
 } // end anonymous namespace
 
 namespace llvm {
 

 }
 
 template <class ELFT>
 void LLVMELFDumper<ELFT>::printRelrReloc(const Elf_Relr &R) {
   W.startLine() << W.hex(R) << "\n";
 }
 
 template <class ELFT>
-void LLVMELFDumper<ELFT>::printRelRelaReloc(const Relocation<ELFT> &R,
-                                            const RelSymbol<ELFT> &RelSym) {
-  StringRef SymbolName = RelSym.Name;
-  SmallString<32> RelocName;
-  this->Obj.getRelocationTypeName(R.Type, RelocName);
-
-  if (opts::ExpandRelocs) {
-    DictScope Group(W, "Relocation");
-    W.printHex("Offset", R.Offset);
-    W.printNumber("Type", RelocName, R.Type);
-    W.printNumber("Symbol", !SymbolName.empty() ? SymbolName : "-", R.Symbol);
-    if (R.Addend)
-      W.printHex("Addend", (uintX_t)*R.Addend);
-  } else {
-    raw_ostream &OS = W.startLine();
-    OS << W.hex(R.Offset) << " " << RelocName << " "
-       << (!SymbolName.empty() ? SymbolName : "-");
-    if (R.Addend)
-      OS << " " << W.hex((uintX_t)*R.Addend);
-    OS << "\n";
-  }
+void LLVMELFDumper<ELFT>::printExpandedRelRelaReloc(const Relocation<ELFT> &R,
+                                                    StringRef SymbolName,
+                                                    StringRef RelocName) {
+}
+
+template <class ELFT>
+void LLVMELFDumper<ELFT>::printDefaultRelRelaReloc(const Relocation<ELFT> &R,
+                                                   StringRef SymbolName,
+                                                   StringRef RelocName) {
+
+template <class ELFT>
+void LLVMELFDumper<ELFT>::printRelRelaReloc(const Relocation<ELFT> &R,
+                                            const RelSymbol<ELFT> &RelSym) {
+  StringRef SymbolName = RelSym.Name;
+  SmallString<32> RelocName;
+  this->Obj.getRelocationTypeName(R.Type, RelocName);
+
+  if (opts::ExpandRelocs) {
+    printExpandedRelRelaReloc(R, SymbolName, RelocName);
+  } else {
+    printDefaultRelRelaReloc(R, SymbolName, RelocName);
+  }
 }
 
 template <class ELFT> void LLVMELFDumper<ELFT>::printSectionHeaders() {
   ListScope SectionsD(W, "Sections");
 
   int SectionIndex = -1;
   std::vector<EnumEntry<unsigned>> FlagsList =
       getSectionFlagsForTarget(this->Obj.getHeader().e_ident[ELF::EI_OSABI],

 
 template <class ELFT>
 void JSONELFDumper<ELFT>::printZeroSymbolOtherField(
     const Elf_Sym &Symbol) const {
   // We want the JSON format to be uniform, since it is machine readable, so
   // always print the `Other` field the same way.
   this->printSymbolOtherField(Symbol);
 }
+
+template <class ELFT>
+void JSONELFDumper<ELFT>::printDefaultRelRelaReloc(const Relocation<ELFT> &R,
+                                                   StringRef SymbolName,
+                                                   StringRef RelocName) {
+  this->printExpandedRelRelaReloc(R, SymbolName, RelocName);
+}