commit 956b1d19337d2b6de3e4bb9ef412fd4bf921b608
author Jez Ng <jezng@fb.com> Tue Apr 06 17:52:30 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Mon Apr 12 11:34:36 2021 -0700
tree cb88919fa476d4e2eeb7a050da8782599c5d7cc0
parent 2f6e4a700d28f30e422c9d43c6c2465f203b2507

[lld-macho] Symbol::value should always be uint64_t

D98837 migrated a bunch of `value`s to uint64_t, but missed these.

GitOrigin-RevId: 2461804b484e53e448632de0b195ce187e9b0b04

MachO/InputFiles.cpp

diff --git a/MachO/InputFiles.cpp b/MachO/InputFiles.cpp
index 66dcca0..8e55463 100644
--- a/MachO/InputFiles.cpp
+++ b/MachO/InputFiles.cpp
@@ -485,7 +485,8 @@
       nextIsec->data = isec->data.slice(symbolOffset);
       isec->data = isec->data.slice(0, symbolOffset);
 
-      // By construction, the symbol will be at offset zero in the new section.
+      // By construction, the symbol will be at offset zero in the new
+      // subsection.
       symbols[symIndex] =
           createDefined(sym, name, nextIsec, /*value=*/0, symbolSize);
       // TODO: ld64 appears to preserve the original alignment as well as each

MachO/SymbolTable.cpp

diff --git a/MachO/SymbolTable.cpp b/MachO/SymbolTable.cpp
index 127d513..76d4289 100644
--- a/MachO/SymbolTable.cpp
+++ b/MachO/SymbolTable.cpp
@@ -159,7 +159,7 @@
 }
 
 Defined *SymbolTable::addSynthetic(StringRef name, InputSection *isec,
-                                   uint32_t value, bool isPrivateExtern,
+                                   uint64_t value, bool isPrivateExtern,
                                    bool includeInSymtab) {
   Defined *s = addDefined(name, nullptr, isec, value, /*size=*/0,
                           /*isWeakDef=*/false, isPrivateExtern);

MachO/SymbolTable.h

diff --git a/MachO/SymbolTable.h b/MachO/SymbolTable.h
index 8a5c16c..29aa03e 100644
--- a/MachO/SymbolTable.h
+++ b/MachO/SymbolTable.h
@@ -52,7 +52,7 @@
   Symbol *addLazy(StringRef name, ArchiveFile *file,
                   const llvm::object::Archive::Symbol &sym);
 
-  Defined *addSynthetic(StringRef name, InputSection *, uint32_t value,
+  Defined *addSynthetic(StringRef name, InputSection *, uint64_t value,
                         bool isPrivateExtern, bool includeInSymtab);
 
   ArrayRef<Symbol *> getSymbols() const { return symVector; }