release/21.x: [libunwind] Fix return type of DwarfFDECache::findFDE() in definition (#146308)
#150126
Conversation
|
@llvm/pr-subscribers-libunwind Author: None (llvmbot) ChangesBackport eb0d8f9 Requested by: @alexrp Full diff: https://github.com/llvm/llvm-project/pull/150126.diff 1 Files Affected:
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) {
|
|
Who can review this? |
"Update with rebase" appears to not be enabled on the repo, so I did it with a merge commit. Hopefully that's fine since it gets squashed anyway. FWIW, I consider this a pretty low-risk patch; I would expect identical machine code. |
Unfortunately it doesn't get squashed when we merge to the repo. We use a custom script to merge to the release branch. You need to manually squash / rebase and push to the branch, but I'll handle it. |
|
Looks like the CI needs to be retried? |
…on (llvm#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 eb0d8f9)
Backport eb0d8f9
Requested by: @alexrp