From e7bf9cbabe30a59426f321da1a4f8ac002095594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Mon, 30 Jun 2025 06:34:44 +0200 Subject: [PATCH] [libunwind] Fix return type of DwarfFDECache::findFDE() in definition 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::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); ~~~~~~~^ --- libunwind/src/UnwindCursor.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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::_registeredForDyldUnloads = false; #endif template -typename A::pint_t DwarfFDECache::findFDE(pint_t mh, pint_t pc) { +typename DwarfFDECache::pint_t DwarfFDECache::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) {