[PATCH] D145637: [dsymutil] Fix offset calculation for fat binaries

[Jonas Devlieghere via Phabricator via llvm-commits]

JDevlieghere created this revision.
JDevlieghere added reviewers: clayborg, friss.
Herald added a project: All.
JDevlieghere requested review of this revision.
Herald added a project: LLVM.

The Mach-O file format uses 32-bit values to encodes offsets which they cannot exceed UIN32_MAX (4GB). The Mach-O file itself can be larger than 4GB as long as none of the offsets fall within this limit. For universal binaries, dsymutil determines if the offset is going to exceed the 4GB limit by computing the size of the header and adding it to the size of all the slices. This is incorrect because it computes the end offset of the final slice. For the purpose of the 4GB limit, only the starting offset matters. The size of the last slice is irrelevant as long as it itself is a valid Mach-O.

rdar://104435018


https://reviews.llvm.org/D145637

Files:
  llvm/tools/dsymutil/dsymutil.cpp


Index: llvm/tools/dsymutil/dsymutil.cpp
===================================================================
--- llvm/tools/dsymutil/dsymutil.cpp
+++ llvm/tools/dsymutil/dsymutil.cpp
@@ -35,6 +35,7 @@
 #include "llvm/Support/CrashRecoveryContext.h"
 #include "llvm/Support/FileCollector.h"
 #include "llvm/Support/FileSystem.h"
+#include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/InitLLVM.h"
 #include "llvm/Support/LLVMDriver.h"
 #include "llvm/Support/Path.h"
@@ -801,12 +802,14 @@
         ErrorOr<vfs::Status> stat = Options.LinkOpts.VFS->status(File.path());
         if (!stat)
           break;
-        FileOffset += stat->getSize();
         if (FileOffset > UINT32_MAX) {
-          WithColor::error() << "the universal binary has a slice with an "
-              "offset exceeds 4GB and will produce an invalid Mach-O file.";
+          WithColor::error() << formatv(
+              "the universal binary has a slice with a starting offset ({0:x) "
+              "that exceeds 4GB and will produce an invalid Mach-O file.",
+              FileOffset);
           return EXIT_FAILURE;
         }
+        FileOffset += stat->getSize();
       }
       if (!MachOUtils::generateUniversalBinary(TempFiles,
                                                OutputLocationOrErr->DWARFFile,


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D145637.503584.patch
Type: text/x-patch
Size: 1308 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230309/ad664ab1/attachment.bin>