[llvm] [llvm-objdump] --disassemble-symbols: skip inline relocs from symbols that are not dumped (PR #75724)
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Mon Dec 18 09:53:18 PST 2023
https://github.com/MaskRay updated https://github.com/llvm/llvm-project/pull/75724
>From 78df720a3487ae7b8971f4baeca6bbbe8025e892 Mon Sep 17 00:00:00 2001
From: Fangrui Song <i at maskray.me>
Date: Sat, 16 Dec 2023 15:52:24 -0800
Subject: [PATCH 1/2] [llvm-objdump] --disassemble-symbols: skip inline relocs
from symbols that are not dumped
When a section contains two functions x1 and x2, we incorrectly display
x1's relocations when dumping x2 for `--disassemble-symbols=x2 -r`.
Fix #75539 by ignoring these relocations.
---
.../llvm-objdump/X86/disassemble-zeroes-relocations.test | 5 +++++
.../llvm-objdump/X86/elf-disassemble-relocs-exec.test | 2 --
.../tools/llvm-objdump/X86/elf-disassemble-relocs.test | 6 +-----
llvm/tools/llvm-objdump/llvm-objdump.cpp | 9 ++++++++-
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/llvm/test/tools/llvm-objdump/X86/disassemble-zeroes-relocations.test b/llvm/test/tools/llvm-objdump/X86/disassemble-zeroes-relocations.test
index 62776f8c5a9900..6f268247e8ebbb 100644
--- a/llvm/test/tools/llvm-objdump/X86/disassemble-zeroes-relocations.test
+++ b/llvm/test/tools/llvm-objdump/X86/disassemble-zeroes-relocations.test
@@ -35,6 +35,11 @@
# CHECK2-EMPTY:
# CHECK2-NEXT: 0000000000000037 <rodata3>:
# CHECK2-NEXT: ...
+# CHECK2-NEXT: 3f: 00 00 addb %al, (%rax)
+# CHECK2-NEXT: 000000000000003f: R_X86_64_64 x3
+# CHECK2-NEXT: 41: 00 00 addb %al, (%rax)
+# CHECK2-NEXT: 43: 00 00 addb %al, (%rax)
+# CHECK2-NEXT: 45: 00 00 addb %al, (%rax)
# CHECK2-NOT: {{.}}
## Check that without -reloc all zeroes would be omitted.
diff --git a/llvm/test/tools/llvm-objdump/X86/elf-disassemble-relocs-exec.test b/llvm/test/tools/llvm-objdump/X86/elf-disassemble-relocs-exec.test
index 6c3c0bd1c98038..fbef73ac324728 100644
--- a/llvm/test/tools/llvm-objdump/X86/elf-disassemble-relocs-exec.test
+++ b/llvm/test/tools/llvm-objdump/X86/elf-disassemble-relocs-exec.test
@@ -25,8 +25,6 @@
## FIXME: --disassemble-symbols: remove inline relocs from skipped functions
# CHECK2:000000000040000c <text1>:
#CHECK2-NEXT: 40000c: bf 10 00 40 00 movl $4194320, %edi # imm = 0x400010
-#CHECK2-NEXT: 0000000000400002: R_X86_64_32 .rodata
-#CHECK2-NEXT: 0000000000400007: R_X86_64_PLT32 puts-0x4
#CHECK2-NEXT: 000000000040000d: R_X86_64_32 .rodata
#CHECK2-NOT: {{.}}
diff --git a/llvm/test/tools/llvm-objdump/X86/elf-disassemble-relocs.test b/llvm/test/tools/llvm-objdump/X86/elf-disassemble-relocs.test
index 33438cbfa126e1..cce0712e8fa0d9 100644
--- a/llvm/test/tools/llvm-objdump/X86/elf-disassemble-relocs.test
+++ b/llvm/test/tools/llvm-objdump/X86/elf-disassemble-relocs.test
@@ -28,19 +28,15 @@
# CHECK-NEXT: 000000000000001a: R_X86_64_REX_GOTPCRELX var-0x4
# CHECK-NOT: {{.}}
-## FIXME: --disassemble-symbols: remove inline relocs from skipped functions
# CHECK2: 000000000000000a <x2>:
# CHECK2-NEXT: a: 90 nop
-# CHECK2-NEXT: 0000000000000001: R_X86_64_PC32 foo-0x4
-# CHECK2-NEXT: 0000000000000002: R_X86_64_NONE bar+0x8
-# CHECK2-NEXT: 0000000000000006: R_X86_64_PLT32 foo+0x1
# CHECK2-NEXT: b: 48 8b 05 00 00 00 00 movq (%rip), %rax # 0x12 <x3>
# CHECK2-NEXT: 000000000000000e: R_X86_64_REX_GOTPCRELX var-0x4
# CHECK2-EMPTY:
# CHECK2-NEXT: 0000000000000017 <x4>:
# CHECK2-NEXT: 17: 48 8b 05 00 00 00 00 movq (%rip), %rax # 0x1e <x4+0x7>
-# CHECK2-NEXT: 0000000000000013: R_X86_64_PLT32 foo-0x4
# CHECK2-NEXT: 000000000000001a: R_X86_64_REX_GOTPCRELX var-0x4
+# CHECK2-NOT: {{.}}
.globl x1, x2, x3, x4
x1:
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 12bb70d5537d8a..1cdd84b20970fe 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -1948,6 +1948,13 @@ disassembleObject(ObjectFile &Obj, const ObjectFile &DbgObj,
continue;
}
+ // Skip relocations from symbols that are not dumped.
+ for (; RelCur != RelEnd; ++RelCur) {
+ uint64_t Offset = RelCur->getOffset() - RelAdjustment;
+ if (Index <= Offset)
+ break;
+ }
+
bool DumpARMELFData = false;
bool DumpTracebackTableForXCOFFFunction =
Obj.isXCOFF() && Section.isText() && TracebackTable &&
@@ -2214,7 +2221,7 @@ disassembleObject(ObjectFile &Obj, const ObjectFile &DbgObj,
while (RelCur != RelEnd) {
uint64_t Offset = RelCur->getOffset() - RelAdjustment;
// If this relocation is hidden, skip it.
- if (getHidden(*RelCur) || SectionAddr + Offset < StartAddress) {
+ if (getHidden(*RelCur)) {
++RelCur;
continue;
}
>From 8f3f222fb652812bbcabdf5c4961c9fa9dd42ad4 Mon Sep 17 00:00:00 2001
From: Fangrui Song <i at maskray.me>
Date: Mon, 18 Dec 2023 09:50:21 -0800
Subject: [PATCH 2/2] Remove a FIXME
---
.../test/tools/llvm-objdump/X86/elf-disassemble-relocs-exec.test | 1 -
1 file changed, 1 deletion(-)
diff --git a/llvm/test/tools/llvm-objdump/X86/elf-disassemble-relocs-exec.test b/llvm/test/tools/llvm-objdump/X86/elf-disassemble-relocs-exec.test
index fbef73ac324728..d9f486ce28a779 100644
--- a/llvm/test/tools/llvm-objdump/X86/elf-disassemble-relocs-exec.test
+++ b/llvm/test/tools/llvm-objdump/X86/elf-disassemble-relocs-exec.test
@@ -22,7 +22,6 @@
# CHECK-NEXT: 000000000040000d: R_X86_64_32 .rodata
# CHECK-NOT: {{.}}
-## FIXME: --disassemble-symbols: remove inline relocs from skipped functions
# CHECK2:000000000040000c <text1>:
#CHECK2-NEXT: 40000c: bf 10 00 40 00 movl $4194320, %edi # imm = 0x400010
#CHECK2-NEXT: 000000000040000d: R_X86_64_32 .rodata
More information about the llvm-commits
mailing list