forked from OSchip/llvm-project
[sanitizer] Fix VReport of symbol version
Version is already a string and does not need stringizing.
This commit is contained in:
parent
ea575598f5
commit
c92631a59a
|
@ -133,29 +133,30 @@ DECLARE_REAL(char*, strncpy, char *to, const char *from, uptr size)
|
|||
DECLARE_REAL(uptr, strnlen, const char *s, uptr maxlen)
|
||||
DECLARE_REAL(char*, strstr, const char *s1, const char *s2)
|
||||
|
||||
#if !SANITIZER_MAC
|
||||
#define ASAN_INTERCEPT_FUNC(name) \
|
||||
do { \
|
||||
if (!INTERCEPT_FUNCTION(name)) \
|
||||
VReport(1, "AddressSanitizer: failed to intercept '%s'\n", #name); \
|
||||
} while (0)
|
||||
#define ASAN_INTERCEPT_FUNC_VER(name, ver) \
|
||||
do { \
|
||||
if (!INTERCEPT_FUNCTION_VER(name, ver)) \
|
||||
VReport(1, "AddressSanitizer: failed to intercept '%s@@%s'\n", #name, \
|
||||
#ver); \
|
||||
} while (0)
|
||||
#define ASAN_INTERCEPT_FUNC_VER_UNVERSIONED_FALLBACK(name, ver) \
|
||||
do { \
|
||||
if (!INTERCEPT_FUNCTION_VER(name, ver) && !INTERCEPT_FUNCTION(name)) \
|
||||
VReport(1, "AddressSanitizer: failed to intercept '%s@@%s' or '%s'\n", \
|
||||
#name, #ver, #name); \
|
||||
} while (0)
|
||||
# if !SANITIZER_MAC
|
||||
# define ASAN_INTERCEPT_FUNC(name) \
|
||||
do { \
|
||||
if (!INTERCEPT_FUNCTION(name)) \
|
||||
VReport(1, "AddressSanitizer: failed to intercept '%s'\n", #name); \
|
||||
} while (0)
|
||||
# define ASAN_INTERCEPT_FUNC_VER(name, ver) \
|
||||
do { \
|
||||
if (!INTERCEPT_FUNCTION_VER(name, ver)) \
|
||||
VReport(1, "AddressSanitizer: failed to intercept '%s@@%s'\n", \
|
||||
#name, ver); \
|
||||
} while (0)
|
||||
# define ASAN_INTERCEPT_FUNC_VER_UNVERSIONED_FALLBACK(name, ver) \
|
||||
do { \
|
||||
if (!INTERCEPT_FUNCTION_VER(name, ver) && !INTERCEPT_FUNCTION(name)) \
|
||||
VReport(1, \
|
||||
"AddressSanitizer: failed to intercept '%s@@%s' or '%s'\n", \
|
||||
#name, ver, #name); \
|
||||
} while (0)
|
||||
|
||||
#else
|
||||
# else
|
||||
// OS X interceptors don't need to be initialized with INTERCEPT_FUNCTION.
|
||||
#define ASAN_INTERCEPT_FUNC(name)
|
||||
#endif // SANITIZER_MAC
|
||||
# define ASAN_INTERCEPT_FUNC(name)
|
||||
# endif // SANITIZER_MAC
|
||||
|
||||
#endif // !SANITIZER_FUCHSIA
|
||||
|
||||
|
|
|
@ -48,13 +48,13 @@ DECLARE_REAL(char *, strstr, const char *s1, const char *s2)
|
|||
#define MEMPROF_INTERCEPT_FUNC_VER(name, ver) \
|
||||
do { \
|
||||
if (!INTERCEPT_FUNCTION_VER(name, ver)) \
|
||||
VReport(1, "MemProfiler: failed to intercept '%s@@%s'\n", #name, #ver); \
|
||||
VReport(1, "MemProfiler: failed to intercept '%s@@%s'\n", #name, ver); \
|
||||
} while (0)
|
||||
#define MEMPROF_INTERCEPT_FUNC_VER_UNVERSIONED_FALLBACK(name, ver) \
|
||||
do { \
|
||||
if (!INTERCEPT_FUNCTION_VER(name, ver) && !INTERCEPT_FUNCTION(name)) \
|
||||
VReport(1, "MemProfiler: failed to intercept '%s@@%s' or '%s'\n", #name, \
|
||||
#ver, #name); \
|
||||
ver, #name); \
|
||||
} while (0)
|
||||
|
||||
#endif // MEMPROF_INTERCEPTORS_H
|
||||
|
|
|
@ -1258,13 +1258,13 @@ int OnExit() {
|
|||
do { \
|
||||
if (!INTERCEPT_FUNCTION_VER(name, ver)) \
|
||||
VReport(1, "MemorySanitizer: failed to intercept '%s@@%s'\n", #name, \
|
||||
#ver); \
|
||||
ver); \
|
||||
} while (0)
|
||||
#define MSAN_INTERCEPT_FUNC_VER_UNVERSIONED_FALLBACK(name, ver) \
|
||||
do { \
|
||||
if (!INTERCEPT_FUNCTION_VER(name, ver) && !INTERCEPT_FUNCTION(name)) \
|
||||
VReport(1, "MemorySanitizer: failed to intercept '%s@@%s' or '%s'\n", \
|
||||
#name, #ver, #name); \
|
||||
#name, ver, #name); \
|
||||
} while (0)
|
||||
|
||||
#define COMMON_INTERCEPT_FUNCTION(name) MSAN_INTERCEPT_FUNC(name)
|
||||
|
|
Loading…
Reference in New Issue