File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -199,7 +199,7 @@ namespace photon
199199 uint64_t rwlock_mark;
200200 void * retval;
201201 };
202- char * buf;
202+ char * buf = nullptr ;
203203 char * stackful_alloc_top;
204204 size_t stack_size;
205205// offset 96B
@@ -295,7 +295,9 @@ namespace photon
295295
296296#if defined(__has_feature)
297297# if __has_feature(address_sanitizer) // for clang
298- # define __SANITIZE_ADDRESS__ // GCC already sets this
298+ # ifndef __SANITIZE_ADDRESS__
299+ # define __SANITIZE_ADDRESS__ // GCC already sets this
300+ # endif
299301# endif
300302#endif
301303
904906 mov x28, x29
905907 mov x29, xzr
906908)"
907- #ifdef __ADDRESS_SANITIZER__
909+ #ifdef __SANITIZE_ADDRESS__
908910R"(
909911 bl _asan_start //; asan_start()
910912)"
993995 func = (uint64_t )&spinlock_unlock;
994996 arg = &lock;
995997 }
998+ auto ref = sw.to ->stack .pointer_ref ();
996999 ASAN_DIE_SWITCH (sw.to );
997- _photon_switch_context_defer_die (
998- arg, func, sw.to ->stack .pointer_ref ());
1000+ _photon_switch_context_defer_die (arg, func, ref);
9991001 __builtin_unreachable ();
10001002 }
10011003
You can’t perform that action at this time.
0 commit comments