pub_soft/abseil-cpp
3
0
Fork 0
mirror of https://github.com/abseil/abseil-cpp.git synced 2026-06-04 20:14:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR #2051: Fix absl_stacktrace_test on s390x

Browse Source 
Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/2051

Commit 33bbc26 made changes to stacktrace_emscripten-inl.inc but did not change the stacktrace_generic-inl.inc file. This caused `absl_stacktrace_test` to fail on s390x.
```
Expected: (results[i]) != (nullptr), actual: NULL vs (nullptr)
Unexpected nullptr found at index 14

[  FAILED  ] StackTrace.NoNullptrInPopulatedRange (0 ms)
```
This patch applies the same logic to stacktrace_generic-inl.inc.
Merge b2fef211b0 into 89203a0303

Merging this change closes #2051

COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/2051 from miladfarca:fix-33bbc26 b2fef211b0
PiperOrigin-RevId: 915361786
Change-Id: Iafb02166414df57845410457796758a97bcc253a
This commit is contained in:
Milad Fa
2026-05-14 04:35:55 -07:00
committed by Copybara-Service
parent ca1d7cb497
commit d885e62bc8
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
absl/debugging/internal/stacktrace_generic-inl.inc
View File

@@ -71,13 +71,20 @@ static int UnwindImpl(void** result, uintptr_t* frames, int* sizes,
size = backtrace(stack, kStackLength);
skip_count++; // we want to skip the current frame as well
int result_count = size - skip_count;
if (result_count < 0)
result_count = 0;
if (result_count > max_depth)
result_count = max_depth;
for (int i = 0; i < result_count; i++)
result[i] = stack[i + skip_count];
int num_frames = size - skip_count;
if (num_frames < 0) num_frames = 0;
if (num_frames > max_depth) num_frames = max_depth;
int result_count = 0;
for (int i = 0; i < num_frames; i++) {
int stack_index = i + skip_count;
// Follow x86 and stop if the return address is null (end of stack).
if (stack[stack_index] == nullptr) {
break;
}
result[result_count++] = stack[stack_index];
}
if (IS_STACK_FRAMES) {
// No implementation for finding out the stack frames yet.