[llvm-branch-commits] [libunwind] 496a49d - [libunwind] Fix return type of `DwarfFDECache::findFDE()` in definition (#146308)

[Tobias Hieta via llvm-branch-commits]

Author: Alex Rønne Petersen
Date: 2025-08-08T12:10:00+02:00
New Revision: 496a49d4a268c940658792178629878e4372ecde

URL: https://github.com/llvm/llvm-project/commit/496a49d4a268c940658792178629878e4372ecde
DIFF: https://github.com/llvm/llvm-project/commit/496a49d4a268c940658792178629878e4372ecde.diff

LOG: [libunwind] Fix return type of `DwarfFDECache::findFDE()` in definition (#146308)

Needed to resolve this compilation error on some systems:

lib/libunwind/src/UnwindCursor.hpp:153:38: error: return type of
out-of-line definition of 'libunwind::DwarfFDECache::findFDE' differs
from that in the declaration
    typename A::pint_t DwarfFDECache<A>::findFDE(pint_t mh, pint_t pc) {
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
lib/libunwind/src/libunwind.cpp:31:10: note: in file included from
lib/libunwind/src/libunwind.cpp:31:
    #include "UnwindCursor.hpp"
             ^
lib/libunwind/src/UnwindCursor.hpp:100:17: note: previous declaration is
here
      static pint_t findFDE(pint_t mh, pint_t pc);
             ~~~~~~~^

(cherry picked from commit eb0d8f9272f7c734cdaf31bc33a18e1619e021e4)

Added: 
    

Modified: 
    libunwind/src/UnwindCursor.hpp

Removed: 
    


################################################################################
diff  --git a/libunwind/src/UnwindCursor.hpp b/libunwind/src/UnwindCursor.hpp
index 55db035e62040..9a1afd3721f5a 100644
--- a/libunwind/src/UnwindCursor.hpp
+++ b/libunwind/src/UnwindCursor.hpp
@@ -173,7 +173,8 @@ bool DwarfFDECache<A>::_registeredForDyldUnloads = false;
 #endif
 
 template <typename A>
-typename A::pint_t DwarfFDECache<A>::findFDE(pint_t mh, pint_t pc) {
+typename DwarfFDECache<A>::pint_t DwarfFDECache<A>::findFDE(pint_t mh,
+                                                            pint_t pc) {
   pint_t result = 0;
   _LIBUNWIND_LOG_IF_FALSE(_lock.lock_shared());
   for (entry *p = _buffer; p < _bufferUsed; ++p) {