Skip to content

Fix absl_stacktrace_test on s390x #2051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
miladfarca wants to merge 1 commit into from
+14 −7
Closed

Fix absl_stacktrace_test on s390x #2051

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions absl/debugging/internal/stacktrace_generic-inl.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down