[libunwind] Fix return type of DwarfFDECache::findFDE() in definition
#146308
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-libunwind Author: Alex Rønne Petersen (alexrp) ChangesNeeded to resolve this compilation error on some systems: Full diff: https://github.com/llvm/llvm-project/pull/146308.diff 1 Files Affected:
diff --git a/libunwind/src/UnwindCursor.hpp b/libunwind/src/UnwindCursor.hpp
index 55db035e62040..7586749cd2ad5 100644
--- a/libunwind/src/UnwindCursor.hpp
+++ b/libunwind/src/UnwindCursor.hpp
@@ -173,7 +173,7 @@ 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) {
|
alexrp
changed the title
DwarfFDECache::find() in definitionDwarfFDECache::findFDE() in definition
alexrp
force-pushed
the
libunwind-findfde-build-fix
branch
from
e07d50b to
bd8a55f
Compare
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
alexrp
force-pushed
the
libunwind-findfde-build-fix
branch
from
bd8a55f to
3600ba7
Compare
alexrp
added a commit
to alexrp/zig
that referenced
this pull request
Jun 30, 2025
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);
~~~~~~~^
alexrp
force-pushed
the
libunwind-findfde-build-fix
branch
from
3600ba7 to
e7bf9cb
Compare
|
Ping, would like to get this into LLVM 21. |
|
Going to merge since this is fairly trivial and there hasn't been any review comments thus far. Still happy to address post-merge review comments of course. |
|
/cherry-pick eb0d8f9 |
|
/pull-request #150126 |
mahesh-attarde
pushed a commit
to mahesh-attarde/llvm-project
that referenced
this pull request
Jul 28, 2025
…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); ~~~~~~~^
tru
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Jul 29, 2025
…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)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Needed to resolve this compilation error on some systems: