breeze/libunwind
1
0
Fork 0
mirror of https://github.com/libunwind/libunwind.git synced 2026-01-12 00:04:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Do not fallback to slow_backtrace when tdep_trace stops unwinding"

Browse Source 
This reverts commit 5b195ffd50 because it breaks
both arm and armhf test suites.
This commit is contained in:
Mathieu Othacehe
2025-06-03 16:53:10 +02:00
committed by Stephen M. Webb
parent 7718ecc1dd
commit 09885eb855
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mi/backtrace.c
View File

@@ -67,8 +67,7 @@ unw_backtrace (void **buffer, int size)
if (unlikely (unw_init_local (&cursor, &uc) < 0))
return 0;
int ret = tdep_trace (&cursor, buffer, &n);
if (unlikely (ret < 0 && ret != -UNW_ESTOPUNWIND))
if (unlikely (tdep_trace (&cursor, buffer, &n) < 0))
{
unw_getcontext (&uc);
return slow_backtrace (buffer, size, &uc, 0);
@@ -109,8 +108,7 @@ unw_backtrace2 (void **buffer, int size, unw_context_t* uc2, int flag)
// returns the number of frames collected by tdep_trace or slow_backtrace
// and add 1 to it (the one we retrieved above)
int ret = tdep_trace (&cursor, buffer, &n);
if (unlikely (ret < 0 && ret != -UNW_ESTOPUNWIND))
if (unlikely (tdep_trace (&cursor, buffer, &n) < 0))
{
return slow_backtrace (buffer, remaining_size, &uc, flag) + 1;
}