Skip to content

Commit b70a41a

Browse files
SC llvm teamSC llvm team
authored andcommitted
Merged main:c2205ab30917 into amd-gfx:cfb0aab9fdbf
Local branch amd-gfx cfb0aab Merged main:4c3206c5d5de into amd-gfx:66b766bb118d Remote branch main c2205ab [Sanitizers][Darwin] Pass offset to __asan_set_shadow_xx (llvm#71745)
2 parents cfb0aab + c2205ab commit b70a41a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

compiler-rt/lib/asan_abi/asan_abi_shim.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ void __asan_handle_no_return(void) { __asan_abi_handle_no_return(); }
6565

6666
// Variables concerning RTL state. These provisionally exist for completeness
6767
// but will likely move into the Stable ABI implementation and not in the shim.
68-
uptr __asan_shadow_memory_dynamic_address = (uptr)0xdeaddeaddeadbeaf;
69-
int __asan_option_detect_stack_use_after_return = 0;
68+
uptr __asan_shadow_memory_dynamic_address = (uptr)0L;
69+
int __asan_option_detect_stack_use_after_return = 1;
7070

7171
// Functions concerning memory load and store reporting
7272
void __asan_report_load1(uptr addr) {

llvm/include/llvm/Config/llvm-config.h.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/* Indicate that this is LLVM compiled from the amd-gfx branch. */
1818
#define LLVM_HAVE_BRANCH_AMD_GFX
19-
#define LLVM_MAIN_REVISION 480535
19+
#define LLVM_MAIN_REVISION 480536
2020

2121
/* Define if LLVM_ENABLE_DUMP is enabled */
2222
#cmakedefine LLVM_ENABLE_DUMP

0 commit comments

Comments
 (0)