[dsymutil] fix accidental 32bit truncation in patchFrameInfoForObject

[aarzilli]

Summary

patchFrameInfoForObject accidentally truncates FDE addresses to the least significant 32bits, which causes the Go bug: https://github.com/golang/go/issues/25841.

[aarzilli]

I see that there's a failed test but I don't understand what it is or how this could cause it.

[JDevlieghere]

LGTM

[aarzilli]

I don't have permissions to commit, if there is nothing left to the review someone else has to do it.

llvm/include/llvm/DWARFLinker/DWARFLinker.h

public:
 
   /// Emit the .debug_pubtypes contribution for \p Unit.
   virtual void emitPubTypesForUnit(const CompileUnit &Unit) = 0;
 
   /// Emit a CIE.
   virtual void emitCIE(StringRef CIEBytes) = 0;
 
   /// Emit an FDE with data \p Bytes.
-  virtual void emitFDE(uint32_t CIEOffset, uint32_t AddreSize, uint32_t Address,
+  virtual void emitFDE(uint32_t CIEOffset, uint32_t AddreSize, uint64_t Address,
                        StringRef Bytes) = 0;
 
   /// Emit the .debug_loc contribution for \p Unit by copying the entries from
   /// \p Dwarf and offsetting them. Update the location attributes to point to
   /// the new entries.
   virtual void emitLocationsForUnit(
       const CompileUnit &Unit, DWARFContext &Dwarf,
       std::function<void(StringRef, SmallVectorImpl<uint8_t> &)>

llvm/include/llvm/DWARFLinker/DWARFStreamer.h

public:
 
   /// Emit the .debug_pubtypes contribution for \p Unit.
   void emitPubTypesForUnit(const CompileUnit &Unit) override;
 
   /// Emit a CIE.
   void emitCIE(StringRef CIEBytes) override;
 
   /// Emit an FDE with data \p Bytes.
-  void emitFDE(uint32_t CIEOffset, uint32_t AddreSize, uint32_t Address,
+  void emitFDE(uint32_t CIEOffset, uint32_t AddreSize, uint64_t Address,
                StringRef Bytes) override;
 
   /// Emit DWARF debug names.
   void emitDebugNames(AccelTable<DWARF5AccelTableStaticData> &Table) override;
 
   /// Emit Apple namespaces accelerator table.
   void emitAppleNamespaces(
       AccelTable<AppleAccelTableStaticOffsetData> &Table) override;

llvm/lib/DWARFLinker/DWARFLinker.cpp

if (CIEId == 0xFFFFFFFF) {
       // This is a CIE, store it.
       StringRef CIEData = FrameData.substr(EntryOffset, InitialLength + 4);
       LocalCIES[EntryOffset] = CIEData;
       // The -4 is to account for the CIEId we just read.
       InputOffset += InitialLength - 4;
       continue;
     }
 
-    uint32_t Loc = Data.getUnsigned(&InputOffset, AddrSize);
+    uint64_t Loc = Data.getUnsigned(&InputOffset, AddrSize);
 
     // Some compilers seem to emit frame info that doesn't start at
     // the function entry point, thus we can't just lookup the address
     // in the debug map. Use the AddressInfo's range map to see if the FDE
     // describes something that we can relocate.
     std::optional<std::pair<AddressRange, int64_t>> Range =
         Ranges.getRangeValueThatContains(Loc);
     if (!Range) {

llvm/lib/DWARFLinker/DWARFStreamer.cpp

void DwarfStreamer::emitCIE(StringRef CIEBytes) {
   MS->emitBytes(CIEBytes);
   FrameSectionSize += CIEBytes.size();
 }
 
 /// Emit a FDE into the debug_frame section. \p FDEBytes
 /// contains the FDE data without the length, CIE offset and address
 /// which will be replaced with the parameter values.
 void DwarfStreamer::emitFDE(uint32_t CIEOffset, uint32_t AddrSize,
-                            uint32_t Address, StringRef FDEBytes) {
+                            uint64_t Address, StringRef FDEBytes) {
   MS->switchSection(MC->getObjectFileInfo()->getDwarfFrameSection());
 
   MS->emitIntValue(FDEBytes.size() + 4 + AddrSize, 4);
   MS->emitIntValue(CIEOffset, 4);
   MS->emitIntValue(Address, AddrSize);
   MS->emitBytes(FDEBytes);
   FrameSectionSize += FDEBytes.size() + 8 + AddrSize;
 }
 
 } // namespace llvm