summaryrefslogtreecommitdiff
path: root/lib/sanitizer_common/sanitizer_printf.cpp
diff options
context:
space:
mode:
authorMatt Morehouse <mascasa@google.com>2019-10-02 20:13:21 +0000
committerMatt Morehouse <mascasa@google.com>2019-10-02 20:13:21 +0000
commitc88ce270afe17bf35376a89c8b929eee93764e07 (patch)
treeb696e8ea2d8cd0d90b6617d50c5b77c357bcd6a6 /lib/sanitizer_common/sanitizer_printf.cpp
parent5f8a0110ec12ac0b7c86545c5058ab287c070b5e (diff)
downloadcompiler-rt-c88ce270afe17bf35376a89c8b929eee93764e07.tar.gz
[sanitizer_common] Rename OnPrint to __sanitizer_on_print.
Summary: https://reviews.llvm.org/D28596 exposed OnPrint in the global namespace, which can cause collisions with user-defined OnPrint() functions. Reviewers: vitalybuka, dvyukov Reviewed By: vitalybuka, dvyukov Subscribers: llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D67987 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@373518 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_printf.cpp')
-rw-r--r--lib/sanitizer_common/sanitizer_printf.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/sanitizer_common/sanitizer_printf.cpp b/lib/sanitizer_common/sanitizer_printf.cpp
index 9d1c54478..7063de257 100644
--- a/lib/sanitizer_common/sanitizer_printf.cpp
+++ b/lib/sanitizer_common/sanitizer_printf.cpp
@@ -229,15 +229,21 @@ void SetPrintfAndReportCallback(void (*callback)(const char *)) {
// Can be overriden in frontend.
#if SANITIZER_GO && defined(TSAN_EXTERNAL_HOOKS)
// Implementation must be defined in frontend.
+// TODO(morehouse): Remove OnPrint after migrating Go to __sanitizer_on_print.
extern "C" void OnPrint(const char *str);
+extern "C" void __sanitizer_on_print(const char *str);
#else
-SANITIZER_INTERFACE_WEAK_DEF(void, OnPrint, const char *str) {
+SANITIZER_INTERFACE_WEAK_DEF(void, __sanitizer_on_print, const char *str) {
(void)str;
}
#endif
static void CallPrintfAndReportCallback(const char *str) {
+#if SANITIZER_GO && defined(TSAN_EXTERNAL_HOOKS)
+ // TODO(morehouse): Remove OnPrint after migrating Go to __sanitizer_on_print.
OnPrint(str);
+#endif
+ __sanitizer_on_print(str);
if (PrintfAndReportCallback)
PrintfAndReportCallback(str);
}