[compiler-rt] r194468 - [sanitizer] Avoid needless use of stringification (#symver) in INTERCEPT_FUNCTION_VER.

[Evgeniy Stepanov]

Author: eugenis
Date: Tue Nov 12 04:21:52 2013
New Revision: 194468

URL: http://llvm.org/viewvc/llvm-project?rev=194468&view=rev
Log:
[sanitizer] Avoid needless use of stringification (#symver) in INTERCEPT_FUNCTION_VER.

This is a workaround for clang-format bug (PR17874).

Modified:
    compiler-rt/trunk/lib/interception/interception_linux.h
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
    compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc

Modified: compiler-rt/trunk/lib/interception/interception_linux.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/interception/interception_linux.h?rev=194468&r1=194467&r2=194468&view=diff
==============================================================================
--- compiler-rt/trunk/lib/interception/interception_linux.h (original)
+++ compiler-rt/trunk/lib/interception/interception_linux.h Tue Nov 12 04:21:52 2013
@@ -37,7 +37,7 @@ void *GetFuncAddrVer(const char *func_na
 #if !defined(__ANDROID__)  // android does not have dlvsym
 # define INTERCEPT_FUNCTION_VER_LINUX(func, symver) \
      ::__interception::real_##func = (func##_f)(unsigned long) \
-         ::__interception::GetFuncAddrVer(#func, #symver)
+         ::__interception::GetFuncAddrVer(#func, symver)
 #else
 # define INTERCEPT_FUNCTION_VER_LINUX(func, symver) \
      INTERCEPT_FUNCTION_LINUX(func)

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc?rev=194468&r1=194467&r2=194468&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc Tue Nov 12 04:21:52 2013
@@ -2231,13 +2231,13 @@ INTERCEPTOR(int, pthread_cond_broadcast,
 }
 
 #define INIT_PTHREAD_COND_WAIT \
-  INTERCEPT_FUNCTION_VER(pthread_cond_wait, GLIBC_2.3.2)
+  INTERCEPT_FUNCTION_VER(pthread_cond_wait, "GLIBC_2.3.2")
 #define INIT_PTHREAD_COND_INIT \
-  INTERCEPT_FUNCTION_VER(pthread_cond_init, GLIBC_2.3.2)
+  INTERCEPT_FUNCTION_VER(pthread_cond_init, "GLIBC_2.3.2")
 #define INIT_PTHREAD_COND_SIGNAL \
-  INTERCEPT_FUNCTION_VER(pthread_cond_signal, GLIBC_2.3.2)
+  INTERCEPT_FUNCTION_VER(pthread_cond_signal, "GLIBC_2.3.2")
 #define INIT_PTHREAD_COND_BROADCAST \
-  INTERCEPT_FUNCTION_VER(pthread_cond_broadcast, GLIBC_2.3.2)
+  INTERCEPT_FUNCTION_VER(pthread_cond_broadcast, "GLIBC_2.3.2")
 #else
 #define INIT_PTHREAD_COND_WAIT
 #define INIT_PTHREAD_COND_INIT

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc?rev=194468&r1=194467&r2=194468&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc Tue Nov 12 04:21:52 2013
@@ -2103,8 +2103,8 @@ void InitializeInterceptors() {
   TSAN_INTERCEPT(pthread_rwlock_timedwrlock);
   TSAN_INTERCEPT(pthread_rwlock_unlock);
 
-  INTERCEPT_FUNCTION_VER(pthread_cond_destroy, GLIBC_2.3.2);
-  INTERCEPT_FUNCTION_VER(pthread_cond_timedwait, GLIBC_2.3.2);
+  INTERCEPT_FUNCTION_VER(pthread_cond_destroy, "GLIBC_2.3.2");
+  INTERCEPT_FUNCTION_VER(pthread_cond_timedwait, "GLIBC_2.3.2");
 
   TSAN_INTERCEPT(pthread_barrier_init);
   TSAN_INTERCEPT(pthread_barrier_destroy);