[llvm-branch-commits] [libunwind] release/22.x: [libunwind] fix build errors on x32 and mips n32 (#194310) (PR #194371)

[via llvm-branch-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-libunwind

Author: llvmbot

<details>
<summary>Changes</summary>

Backport 06ddfcf0ca9cdb1481fff3cff6f73d5c26d45ffe

Requested by: @<!-- -->alexrp

---
Full diff: https://github.com/llvm/llvm-project/pull/194371.diff


2 Files Affected:

- (modified) libunwind/src/AddressSpace.hpp (+1-1) 
- (modified) libunwind/src/DwarfParser.hpp (+1-1) 


``````````diff
diff --git a/libunwind/src/AddressSpace.hpp b/libunwind/src/AddressSpace.hpp
index 52477b16b355a..3711189f57b1d 100644
--- a/libunwind/src/AddressSpace.hpp
+++ b/libunwind/src/AddressSpace.hpp
@@ -666,7 +666,7 @@ inline bool LocalAddressSpace::findUnwindSections(
     return true;
   }
 #endif
-  dl_iterate_cb_data cb_data = {this, &info, targetAddr};
+  dl_iterate_cb_data cb_data = {this, &info, static_cast<pint_t>(targetAddr)};
   int found = dl_iterate_phdr(findUnwindSectionsByPhdr, &cb_data);
   return static_cast<bool>(found);
 #endif
diff --git a/libunwind/src/DwarfParser.hpp b/libunwind/src/DwarfParser.hpp
index 22de49023cb45..8e080fb33c5f8 100644
--- a/libunwind/src/DwarfParser.hpp
+++ b/libunwind/src/DwarfParser.hpp
@@ -477,7 +477,7 @@ bool CFI_Parser<A>::parseFDEInstructions(
       {cieInfo.cieInstructions, cieInfo.cieStart + cieInfo.cieLength,
        (pint_t)(-1)},
       {fdeInfo.fdeInstructions, fdeInfo.fdeStart + fdeInfo.fdeLength,
-       upToPC - fdeInfo.pcStart}};
+       static_cast<pint_t>(upToPC) - fdeInfo.pcStart}};
 
   for (const auto &info : parseInfoArray) {
     pint_t p = info.instructions;

``````````

</details>


https://github.com/llvm/llvm-project/pull/194371