[compiler-rt] f20a3cb - [NFC][asan] Clang-format a test
Vitaly Buka via llvm-commits
llvm-commits at lists.llvm.org
Mon Jul 11 10:12:22 PDT 2022
Author: Ivan Trofimov
Date: 2022-07-11T10:12:05-07:00
New Revision: f20a3cbefd81943d0c2df9b8cf171896e78e38c1
URL: https://github.com/llvm/llvm-project/commit/f20a3cbefd81943d0c2df9b8cf171896e78e38c1
DIFF: https://github.com/llvm/llvm-project/commit/f20a3cbefd81943d0c2df9b8cf171896e78e38c1.diff
LOG: [NFC][asan] Clang-format a test
Part of D129219.
Added:
Modified:
compiler-rt/lib/asan/asan_interceptors.cpp
compiler-rt/test/asan/TestCases/Linux/swapcontext_annotation.cpp
Removed:
################################################################################
diff --git a/compiler-rt/lib/asan/asan_interceptors.cpp b/compiler-rt/lib/asan/asan_interceptors.cpp
index 37d0fc67cf75b..6c843968f7af5 100644
--- a/compiler-rt/lib/asan/asan_interceptors.cpp
+++ b/compiler-rt/lib/asan/asan_interceptors.cpp
@@ -249,9 +249,8 @@ static void ClearShadowMemoryForContextStack(uptr stack, uptr ssize) {
ssize += stack - bottom;
ssize = RoundUpTo(ssize, PageSize);
static const uptr kMaxSaneContextStackSize = 1 << 22; // 4 Mb
- if (AddrIsInMem(bottom) && ssize && ssize <= kMaxSaneContextStackSize) {
+ if (AddrIsInMem(bottom) && ssize && ssize <= kMaxSaneContextStackSize)
PoisonShadow(bottom, ssize, 0);
- }
}
INTERCEPTOR(int, swapcontext, struct ucontext_t *oucp,
diff --git a/compiler-rt/test/asan/TestCases/Linux/swapcontext_annotation.cpp b/compiler-rt/test/asan/TestCases/Linux/swapcontext_annotation.cpp
index 2e4179a6e7061..fd5ae17c4d0a5 100644
--- a/compiler-rt/test/asan/TestCases/Linux/swapcontext_annotation.cpp
+++ b/compiler-rt/test/asan/TestCases/Linux/swapcontext_annotation.cpp
@@ -47,7 +47,8 @@ __attribute__((noinline, noreturn)) void LongJump(jmp_buf env) {
// Simulate __asan_handle_no_return().
__attribute__((noinline)) void CallNoReturn() {
jmp_buf env;
- if (setjmp(env) != 0) return;
+ if (setjmp(env) != 0)
+ return;
LongJump(env);
_exit(1);
@@ -59,13 +60,12 @@ void NextChild() {
printf("NextChild from: %p %zu\n", from_stack, from_stacksize);
- char x[32] = {0}; // Stack gets poisoned.
+ char x[32] = {0}; // Stack gets poisoned.
printf("NextChild: %p\n", x);
CallNoReturn();
- __sanitizer_start_switch_fiber(nullptr,
- main_thread_stack,
+ __sanitizer_start_switch_fiber(nullptr, main_thread_stack,
main_thread_stacksize);
CallNoReturn();
if (swapcontext(&next_child_context, &orig_context) < 0) {
@@ -76,10 +76,9 @@ void NextChild() {
void Child(int mode) {
CallNoReturn();
- __sanitizer_finish_switch_fiber(nullptr,
- &main_thread_stack,
+ __sanitizer_finish_switch_fiber(nullptr, &main_thread_stack,
&main_thread_stacksize);
- char x[32] = {0}; // Stack gets poisoned.
+ char x[32] = {0}; // Stack gets poisoned.
printf("Child: %p\n", x);
CallNoReturn();
// (a) Do nothing, just return to parent function.
@@ -87,13 +86,11 @@ void Child(int mode) {
// something.
// (c) Jump to another function which will then jump back to the main function
if (mode == 0) {
- __sanitizer_start_switch_fiber(nullptr,
- main_thread_stack,
+ __sanitizer_start_switch_fiber(nullptr, main_thread_stack,
main_thread_stacksize);
CallNoReturn();
} else if (mode == 1) {
- __sanitizer_start_switch_fiber(nullptr,
- main_thread_stack,
+ __sanitizer_start_switch_fiber(nullptr, main_thread_stack,
main_thread_stacksize);
CallNoReturn();
if (swapcontext(&child_context, &orig_context) < 0) {
@@ -107,8 +104,7 @@ void Child(int mode) {
next_child_context.uc_stack.ss_sp = next_child_stack;
next_child_context.uc_stack.ss_size = kStackSize / 2;
makecontext(&next_child_context, (void (*)())NextChild, 0);
- __sanitizer_start_switch_fiber(nullptr,
- next_child_context.uc_stack.ss_sp,
+ __sanitizer_start_switch_fiber(nullptr, next_child_context.uc_stack.ss_sp,
next_child_context.uc_stack.ss_size);
CallNoReturn();
if (swapcontext(&child_context, &next_child_context) < 0) {
@@ -129,9 +125,8 @@ int Run(int arg, int mode, char *child_stack) {
}
makecontext(&child_context, (void (*)())Child, 1, mode);
CallNoReturn();
- void* fake_stack_save;
- __sanitizer_start_switch_fiber(&fake_stack_save,
- child_context.uc_stack.ss_sp,
+ void *fake_stack_save;
+ __sanitizer_start_switch_fiber(&fake_stack_save, child_context.uc_stack.ss_sp,
child_context.uc_stack.ss_size);
CallNoReturn();
if (swapcontext(&orig_context, &child_context) < 0) {
@@ -139,8 +134,7 @@ int Run(int arg, int mode, char *child_stack) {
_exit(1);
}
CallNoReturn();
- __sanitizer_finish_switch_fiber(fake_stack_save,
- &from_stack,
+ __sanitizer_finish_switch_fiber(fake_stack_save, &from_stack,
&from_stacksize);
CallNoReturn();
printf("Main context from: %p %zu\n", from_stack, from_stacksize);
More information about the llvm-commits
mailing list