Skip to content

[llvm-objdump][macho] Fix relative method list dumping for little endian hosts #85778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2024
Merged

[llvm-objdump][macho] Fix relative method list dumping for little endian hosts #85778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion llvm/test/tools/llvm-objdump/MachO/AArch64/macho-relative-method-lists.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
XFAIL: system-aix
RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/rel-method-lists-arm64_32.dylib | FileCheck %s --check-prefix=CHK32
RUN: llvm-otool -ov %p/Inputs/rel-method-lists-arm64_32.dylib | FileCheck %s --check-prefix=CHK32

Expand Down
12 changes: 8 additions & 4 deletions llvm/tools/llvm-objdump/MachODump.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4499,11 +4499,15 @@ static void print_relative_method_list(uint32_t structSizeAndFlags,
outs() << indent << " (nameRefPtr extends past the end of the section)";
else {
if (pointerSize == 64) {
name = get_pointer_64(*reinterpret_cast<const uint64_t *>(nameRefPtr),
xoffset, left, xS, info);
uint64_t nameOff_64 = *reinterpret_cast<const uint64_t *>(nameRefPtr);
if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
sys::swapByteOrder(nameOff_64);
name = get_pointer_64(nameOff_64, xoffset, left, xS, info);
} else {
name = get_pointer_32(*reinterpret_cast<const uint32_t *>(nameRefPtr),
xoffset, left, xS, info);
uint32_t nameOff_32 = *reinterpret_cast<const uint32_t *>(nameRefPtr);
if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
sys::swapByteOrder(nameOff_32);
name = get_pointer_32(nameOff_32, xoffset, left, xS, info);
}
if (name != nullptr)
outs() << format(" %.*s", left, name);
Expand Down