Cleanup in sanitizer_common_interceptors.inc

[krytarowski]

Summary

Switch a #if SANITIZER_NETBSD block to
COMMON_MAYBE_INTERCEPT_NETBSD_ALIAS*.

No functional change intended.

Requested by <vitalybuka>

Sponsored by <The NetBSD Foundation>

[vitalybuka]

lib/sanitizer_common/sanitizer_common_interceptors.inc

7270

for consistency it should be
INIT_MUTEX_LOCK
INIT_MUTEX_UNLOCK
INIT_SET_CANCEL_STATE

All INIT_* macros are already MAYBE and enabled/disabled according to the platform.

[krytarowski]

lib/sanitizer_common/sanitizer_common_interceptors.inc

7270

These ones are aliases specific to NetBSD libc.

How about: INIT_NETBSD_ALIAS* and INIT_NETBSD_ALIAS_THR*?

[vitalybuka]

lib/sanitizer_common/sanitizer_common_interceptors.inc

4049

and we need SANITIZER_INTERCEPT_* in platform
#if SANITIZER_INTERCEPT__LIBC_MUTEX_LOCK
....

#if SANITIZER_INTERCEPT__LIBC_THR_SETCANCELSTATE
....

7270

I guess the point that here we hide how (_ALIAS_) and on which platform(_NETBSD_) it works

[krytarowski]

lib/sanitizer_common/sanitizer_common_interceptors.inc

7270

These ones are NetBSD-specific and legacy internal symbols in libc, we allowed to handle non-posix or alternative libpthread implementation, but nowadays it will never happen. We will get rid of them with a new major version bump in libc (no ETA for this).

There is a prior-art in TSan for the same case.

However I will go the requested route.

[krytarowski]

I've entirely switched to NetBSD kernel fixes in order to host fully-functional LLDB. Once I will be done with the debugger, I will be back to sanitizers and work on connecting a buildbot and remaining fixes and cleanup.

[krytarowski]

Addressed by @vitalybuka.

Author: vitalybuka
Date: Sat May 12 22:55:45 2018
New Revision: 332190

URL: http://llvm.org/viewvc/llvm-project?rev=332190&view=rev
Log:
[sanitizer] Replace #if SANITIZER_NETBSD with #if SANITIZER_INTERCEPT___LIBC_MUTEX

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h

Thanks for the help and sorry for waiting so long with pending patches.

[vitalybuka]

In D43879#1097102, @krytarowski wrote:

Addressed by @vitalybuka.

Author: vitalybuka
Date: Sat May 12 22:55:45 2018
New Revision: 332190

URL: http://llvm.org/viewvc/llvm-project?rev=332190&view=rev
Log:
[sanitizer] Replace #if SANITIZER_NETBSD with #if SANITIZER_INTERCEPT___LIBC_MUTEX

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h

Thanks for the help and sorry for waiting so long with pending patches.

No problem. Actually I forgot about this review. I am changing mutex interceptors and I've noticed this inconsistency.

lib/sanitizer_common/sanitizer_common_interceptors.inc

 #define INIT_PTHREAD_MUTEX_LOCK COMMON_INTERCEPT_FUNCTION(pthread_mutex_lock)
 #define INIT_PTHREAD_MUTEX_UNLOCK \
   COMMON_INTERCEPT_FUNCTION(pthread_mutex_unlock)
 #else
 #define INIT_PTHREAD_MUTEX_LOCK
 #define INIT_PTHREAD_MUTEX_UNLOCK
 #endif
 
 #if SANITIZER_NETBSD
 INTERCEPTOR(int, __libc_mutex_lock, void *m) \
   ALIAS(WRAPPER_NAME(pthread_mutex_lock));
 INTERCEPTOR(int, __libc_mutex_unlock, void *m) \
   ALIAS(WRAPPER_NAME(pthread_mutex_unlock));
 INTERCEPTOR(int, __libc_thr_setcancelstate, int state, int *oldstate) \
   ALIAS(WRAPPER_NAME(pthread_setcancelstate));
+# define COMMON_MAYBE_INTERCEPT_NETBSD_ALIAS(func) \
+         COMMON_INTERCEPT_FUNCTION(__libc_##func)
+# define COMMON_MAYBE_INTERCEPT_NETBSD_ALIAS_THR(func) \
+         COMMON_INTERCEPT_FUNCTION(__libc_thr_##func)
+#else
+# define COMMON_MAYBE_INTERCEPT_NETBSD_ALIAS(func)
+# define COMMON_MAYBE_INTERCEPT_NETBSD_ALIAS_THR(func)
 #endif
 
+
 #if SANITIZER_INTERCEPT_GETMNTENT || SANITIZER_INTERCEPT_GETMNTENT_R
 static void write_mntent(void *ctx, __sanitizer_mntent *mnt) {
   COMMON_INTERCEPTOR_WRITE_RANGE(ctx, mnt, sizeof(*mnt));
   if (mnt->mnt_fsname)
     COMMON_INTERCEPTOR_WRITE_RANGE(ctx, mnt->mnt_fsname,
                                    REAL(strlen)(mnt->mnt_fsname) + 1);
   if (mnt->mnt_dir)
     COMMON_INTERCEPTOR_WRITE_RANGE(ctx, mnt->mnt_dir,
static void InitializeCommonInterceptors() {
   INIT_DEVNAME;
   INIT_DEVNAME_R;
   INIT_FGETLN;
   INIT_STRMODE;
   INIT_TTYENT;
   INIT_PROTOENT;
   INIT_NETENT;
 
-#if SANITIZER_NETBSD
-  COMMON_INTERCEPT_FUNCTION(__libc_mutex_lock);
-  COMMON_INTERCEPT_FUNCTION(__libc_mutex_unlock);
-  COMMON_INTERCEPT_FUNCTION(__libc_thr_setcancelstate);
-#endif
+  COMMON_MAYBE_INTERCEPT_NETBSD_ALIAS(mutex_lock);
+  COMMON_MAYBE_INTERCEPT_NETBSD_ALIAS(mutex_unlock);
+  COMMON_MAYBE_INTERCEPT_NETBSD_ALIAS_THR(setcancelstate);
 
   INIT___PRINTF_CHK;
 }