diff options
| author | Kostya Serebryany <kcc@google.com> | 2016-09-19 14:18:16 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2016-09-19 14:18:16 +0000 |
| commit | f0ca160ea27bff175c81ea1256af958bff166149 (patch) | |
| tree | e7c18b905a5146d60923b6d81e0c618ce9d0daac | |
| parent | f135f0ec1daa7779a7bcc49f232165d1f09f3fdc (diff) | |
| download | bcm5719-llvm-f0ca160ea27bff175c81ea1256af958bff166149.tar.gz bcm5719-llvm-f0ca160ea27bff175c81ea1256af958bff166149.zip | |
[sanitizer] rename __sanitizer_symbolize_data to __sanitizer_symbolize_global (to avoid conflict with another definition)
llvm-svn: 281902
4 files changed, 6 insertions, 6 deletions
diff --git a/compiler-rt/include/sanitizer/common_interface_defs.h b/compiler-rt/include/sanitizer/common_interface_defs.h index 0ebe91018fd..d8ff272c29f 100644 --- a/compiler-rt/include/sanitizer/common_interface_defs.h +++ b/compiler-rt/include/sanitizer/common_interface_defs.h @@ -124,8 +124,8 @@ extern "C" { void __sanitizer_symbolize_pc(void *pc, const char *fmt, char *out_buf, size_t out_buf_size); // Same as __sanitizer_symbolize_pc, but for data section (i.e. globals). - void __sanitizer_symbolize_data(void *data_ptr, const char *fmt, - char *out_buf, size_t out_buf_size); + void __sanitizer_symbolize_global(void *data_ptr, const char *fmt, + char *out_buf, size_t out_buf_size); // Sets the callback to be called right before death on error. // Passing 0 will unset the callback. diff --git a/compiler-rt/lib/asan/asan_win_dll_thunk.cc b/compiler-rt/lib/asan/asan_win_dll_thunk.cc index 396c48cf1e3..4b8a08c5e97 100644 --- a/compiler-rt/lib/asan/asan_win_dll_thunk.cc +++ b/compiler-rt/lib/asan/asan_win_dll_thunk.cc @@ -335,7 +335,7 @@ INTERFACE_FUNCTION(__sanitizer_get_unmapped_bytes) INTERFACE_FUNCTION(__sanitizer_maybe_open_cov_file) INTERFACE_FUNCTION(__sanitizer_print_stack_trace) INTERFACE_FUNCTION(__sanitizer_symbolize_pc) -INTERFACE_FUNCTION(__sanitizer_symbolize_data) +INTERFACE_FUNCTION(__sanitizer_symbolize_global) INTERFACE_FUNCTION(__sanitizer_ptr_cmp) INTERFACE_FUNCTION(__sanitizer_ptr_sub) INTERFACE_FUNCTION(__sanitizer_report_error_summary) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_libcdep.cc b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_libcdep.cc index cb2ed42818e..ddf537a7e56 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_libcdep.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_libcdep.cc @@ -106,8 +106,8 @@ void __sanitizer_symbolize_pc(uptr pc, const char *fmt, char *out_buf, } SANITIZER_INTERFACE_ATTRIBUTE -void __sanitizer_symbolize_data(uptr data_addr, const char *fmt, char *out_buf, - uptr out_buf_size) { +void __sanitizer_symbolize_global(uptr data_addr, const char *fmt, + char *out_buf, uptr out_buf_size) { if (!out_buf_size) return; out_buf[0] = 0; DataInfo DI; diff --git a/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc.cc b/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc.cc index d291bd375ef..0cc81e1f7dc 100644 --- a/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc.cc +++ b/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc.cc @@ -28,7 +28,7 @@ void SymbolizeCaller() { void SymbolizeData() { char data[100]; - __sanitizer_symbolize_data(&GLOBAL_VAR_ABC, "%g %s:%l", data, sizeof(data)); + __sanitizer_symbolize_global(&GLOBAL_VAR_ABC, "%g %s:%l", data, sizeof(data)); printf("GLOBAL: %s\n", data); } |
