Skip to content
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.

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

[hwasan] Fix and re-enable deep-recursion.c #69265

Merged
merged 2 commits into from
Oct 17, 2023
Merged
Changes from all commits
Commits
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: 17 additions & 4 deletions compiler-rt/test/hwasan/TestCases/deep-recursion.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
// Stack histories are currently not recorded on x86.
// XFAIL: target=x86_64{{.*}}

// Flaky on AArch64 Linux, see https://github.com/llvm/llvm-project/issues/69221.
// UNSUPPORTED: target=aarch64{{.*}}

#include <stdlib.h>
// At least -O1 is needed for this function to not have a stack frame on
// AArch64.
Expand All @@ -29,7 +26,23 @@ void USE(void *x) { // pretend_to_do_something(void *x)

volatile int four = 4;

__attribute__((noinline)) void OOB() { int x[4]; x[four] = 0; USE(&x[0]); }
__attribute__((noinline)) void OOB() {
int x[4];
int y[4];

// Tags for stack-allocated variables can occasionally be zero, resulting in
// a false negative for this test. This is not easy to fix, hence we work
// around it: if the tag is zero, we use the neighboring variable instead,
// which must have a different (hence non-zero) tag.
// This tag check assumes aarch64.
if (((uintptr_t)&x) >> 56 == 0) {
y[four] = 0;
} else {
x[four] = 0;
}
USE(&x[0]);
USE(&y[0]);
}
__attribute__((noinline)) void FUNC1() { int x; USE(&x); OOB(); }
__attribute__((noinline)) void FUNC2() { int x; USE(&x); FUNC1(); }
__attribute__((noinline)) void FUNC3() { int x; USE(&x); FUNC2(); }
Expand Down