[llvm] r346412 - [dsymutil] Copy the LC_BUILD_VERSION load command into the companion binary.

[Adrian Prantl via llvm-commits]

Author: adrian
Date: Thu Nov  8 08:54:59 2018
New Revision: 346412

URL: http://llvm.org/viewvc/llvm-project?rev=346412&view=rev
Log:
[dsymutil] Copy the LC_BUILD_VERSION load command into the companion binary.

LC_BUILD_VERSION contains platform information that is useful for LLDB
to match up dSYM bundles with binaries. This patch copies the load
command over into the dSYM.

rdar://problem/44145175
rdar://problem/45883463

Differential Revision: https://reviews.llvm.org/D54233

Added:
    llvm/trunk/test/tools/dsymutil/Inputs/lc_build_version.x86_64
    llvm/trunk/test/tools/dsymutil/X86/lc_build_version.test
Modified:
    llvm/trunk/tools/dsymutil/MachOUtils.cpp

Added: llvm/trunk/test/tools/dsymutil/Inputs/lc_build_version.x86_64
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/Inputs/lc_build_version.x86_64?rev=346412&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/dsymutil/Inputs/lc_build_version.x86_64 (added) and llvm/trunk/test/tools/dsymutil/Inputs/lc_build_version.x86_64 Thu Nov  8 08:54:59 2018 differ

Added: llvm/trunk/test/tools/dsymutil/X86/lc_build_version.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/lc_build_version.test?rev=346412&view=auto
==============================================================================
--- llvm/trunk/test/tools/dsymutil/X86/lc_build_version.test (added)
+++ llvm/trunk/test/tools/dsymutil/X86/lc_build_version.test Thu Nov  8 08:54:59 2018
@@ -0,0 +1,11 @@
+# RUN: dsymutil -f %p/../Inputs/lc_build_version.x86_64 -o - \
+# RUN:   | obj2yaml | FileCheck %s
+
+CHECK: LoadCommands:
+CHECK:   - cmd:             LC_BUILD_VERSION
+CHECK-NEXT:    cmdsize:         24
+CHECK-NEXT:    platform:        1
+CHECK-NEXT:    minos:           658944
+CHECK-NEXT:    sdk:             658944
+CHECK-NEXT:    ntools:          0
+CHECK-NEXT: - cmd

Modified: llvm/trunk/tools/dsymutil/MachOUtils.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/MachOUtils.cpp?rev=346412&r1=346411&r2=346412&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/MachOUtils.cpp (original)
+++ llvm/trunk/tools/dsymutil/MachOUtils.cpp Thu Nov  8 08:54:59 2018
@@ -368,27 +368,34 @@ bool generateDsymCompanion(const DebugMa
   bool Is64Bit = Writer.is64Bit();
   MachO::symtab_command SymtabCmd = InputBinary.getSymtabLoadCommand();
 
-  // Get UUID.
+  // Compute the number of load commands we will need.
+  unsigned LoadCommandSize = 0;
+  unsigned NumLoadCommands = 0;
+
+  // Get LC_UUID and LC_BUILD_VERSION.
   MachO::uuid_command UUIDCmd;
+  MachO::build_version_command BuildVersionCmd;
   memset(&UUIDCmd, 0, sizeof(UUIDCmd));
-  UUIDCmd.cmd = MachO::LC_UUID;
-  UUIDCmd.cmdsize = sizeof(MachO::uuid_command);
+  memset(&BuildVersionCmd, 0, sizeof(BuildVersionCmd));
   for (auto &LCI : InputBinary.load_commands()) {
-    if (LCI.C.cmd == MachO::LC_UUID) {
+    switch (LCI.C.cmd) {
+    case MachO::LC_UUID:
       UUIDCmd = InputBinary.getUuidCommand(LCI);
+      ++NumLoadCommands;
+      LoadCommandSize += sizeof(MachO::uuid_command);
+      break;
+    case MachO::LC_BUILD_VERSION:
+      BuildVersionCmd = InputBinary.getBuildVersionLoadCommand(LCI);
+      ++NumLoadCommands;
+      LoadCommandSize += sizeof(MachO::build_version_command);
+      // LLDB doesn't care about the build tools for now.
+      BuildVersionCmd.ntools = 0;
+      break;
+    default:
       break;
     }
   }
 
-  // Compute the number of load commands we will need.
-  unsigned LoadCommandSize = 0;
-  unsigned NumLoadCommands = 0;
-  // We will copy the UUID if there is one.
-  if (UUIDCmd.cmd != 0) {
-    ++NumLoadCommands;
-    LoadCommandSize += sizeof(MachO::uuid_command);
-  }
-
   // If we have a valid symtab to copy, do it.
   bool ShouldEmitSymtab =
       isExecutable(InputBinary) && hasLinkEditSegment(InputBinary);
@@ -452,10 +459,18 @@ bool generateDsymCompanion(const DebugMa
   assert(OutFile.tell() == HeaderSize);
   if (UUIDCmd.cmd != 0) {
     Writer.W.write<uint32_t>(UUIDCmd.cmd);
-    Writer.W.write<uint32_t>(UUIDCmd.cmdsize);
+    Writer.W.write<uint32_t>(sizeof(UUIDCmd));
     OutFile.write(reinterpret_cast<const char *>(UUIDCmd.uuid), 16);
     assert(OutFile.tell() == HeaderSize + sizeof(UUIDCmd));
   }
+  if (BuildVersionCmd.cmd != 0) {
+    Writer.W.write<uint32_t>(BuildVersionCmd.cmd);
+    Writer.W.write<uint32_t>(sizeof(BuildVersionCmd));
+    Writer.W.write<uint32_t>(BuildVersionCmd.platform);
+    Writer.W.write<uint32_t>(BuildVersionCmd.minos);
+    Writer.W.write<uint32_t>(BuildVersionCmd.sdk);
+    Writer.W.write<uint32_t>(BuildVersionCmd.ntools);
+  }
 
   assert(SymtabCmd.cmd && "No symbol table.");
   uint64_t StringStart = SymtabStart + NumSyms * NListSize;