Skip to content

Commit

Permalink
[dsymutil] Copy symbol table regardless of LINKEDIT segment
Browse files Browse the repository at this point in the history
Ensure we copy the symbol table for MH_PRELOAD Mach-Os, which don't have
a LINKEDIT segment, but (can) have a symbol table.

rdar://88919473

Differential revision: https://reviews.llvm.org/D120583
  • Loading branch information
JDevlieghere committed Feb 25, 2022
1 parent bbaeb1e commit 03d4904
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 12 deletions.
10 changes: 10 additions & 0 deletions llvm/test/tools/dsymutil/ARM/preload.test
@@ -0,0 +1,10 @@
$ cat foo.c
void start(void) asm("start");
void start(void) {}
$ xcrun clang -c -o foo.o foo.c -g3
$ xcrun clang -o foo foo.o -g3 -Wl,-preload -nodefaultlibs

RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/preload/foo -o %t.dSYM
RUN: llvm-nm %p/../Inputs/private/tmp/preload/foo | FileCheck %s
RUN: llvm-nm %t.dSYM/Contents/Resources/DWARF/foo | FileCheck %s
CHECK: start
Binary file not shown.
Binary file not shown.
19 changes: 7 additions & 12 deletions llvm/tools/dsymutil/MachOUtils.cpp
Expand Up @@ -336,15 +336,6 @@ static bool isExecutable(const object::MachOObjectFile &Obj) {
return Obj.getHeader().filetype != MachO::MH_OBJECT;
}

static bool hasLinkEditSegment(const object::MachOObjectFile &Obj) {
bool HasLinkEditSegment = false;
iterateOnSegments(Obj, [&](const MachO::segment_command_64 &Segment) {
if (StringRef("__LINKEDIT") == Segment.segname)
HasLinkEditSegment = true;
});
return HasLinkEditSegment;
}

static unsigned segmentLoadCommandSize(bool Is64Bit, unsigned NumSections) {
if (Is64Bit)
return sizeof(MachO::segment_command_64) +
Expand Down Expand Up @@ -396,7 +387,9 @@ bool generateDsymCompanion(llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS,
unsigned LoadCommandSize = 0;
unsigned NumLoadCommands = 0;

// Get LC_UUID and LC_BUILD_VERSION.
bool HasSymtab = false;

// Check LC_SYMTAB and get LC_UUID and LC_BUILD_VERSION.
MachO::uuid_command UUIDCmd;
SmallVector<MachO::build_version_command, 2> BuildVersionCmd;
memset(&UUIDCmd, 0, sizeof(UUIDCmd));
Expand All @@ -420,14 +413,16 @@ bool generateDsymCompanion(llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS,
BuildVersionCmd.push_back(Cmd);
break;
}
case MachO::LC_SYMTAB:
HasSymtab = true;
break;
default:
break;
}
}

// If we have a valid symtab to copy, do it.
bool ShouldEmitSymtab =
isExecutable(InputBinary) && hasLinkEditSegment(InputBinary);
bool ShouldEmitSymtab = HasSymtab && isExecutable(InputBinary);
if (ShouldEmitSymtab) {
LoadCommandSize += sizeof(MachO::symtab_command);
++NumLoadCommands;
Expand Down

0 comments on commit 03d4904

Please sign in to comment.