[PATCH] D120583: [dsymutil] Copy symbol table regardless of LINKEDIT segment

[Jonas Devlieghere via Phabricator via llvm-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG03d49046b9ca: [dsymutil] Copy symbol table regardless of LINKEDIT segment (authored by JDevlieghere).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D120583/new/

https://reviews.llvm.org/D120583

Files:
  llvm/test/tools/dsymutil/ARM/preload.test
  llvm/test/tools/dsymutil/Inputs/private/tmp/preload/foo
  llvm/test/tools/dsymutil/Inputs/private/tmp/preload/foo.o
  llvm/tools/dsymutil/MachOUtils.cpp


Index: llvm/tools/dsymutil/MachOUtils.cpp
===================================================================
--- llvm/tools/dsymutil/MachOUtils.cpp
+++ llvm/tools/dsymutil/MachOUtils.cpp
@@ -336,15 +336,6 @@
     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) +
@@ -396,7 +387,9 @@
   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));
@@ -420,14 +413,16 @@
       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;
Index: llvm/test/tools/dsymutil/ARM/preload.test
===================================================================
--- /dev/null
+++ 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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D120583.411512.patch
Type: text/x-patch
Size: 2185 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220225/898a118e/attachment.bin>