[compiler-rt] 9b74924 - Revert "[sanitizer] Intercept sem_open/sem_unlink"

[Florian Mayer via llvm-commits]

Author: Florian Mayer
Date: 2021-08-09T19:50:31+01:00
New Revision: 9b74924b6c40c99188f7497824b670244a7b1864

URL: https://github.com/llvm/llvm-project/commit/9b74924b6c40c99188f7497824b670244a7b1864
DIFF: https://github.com/llvm/llvm-project/commit/9b74924b6c40c99188f7497824b670244a7b1864.diff

LOG: Revert "[sanitizer] Intercept sem_open/sem_unlink"

This reverts commit 69a909b9fefeec5d4ece6f3162f8332f125ea202.

Added: 
    

Modified: 
    compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc

Removed: 
    compiler-rt/test/sanitizer_common/TestCases/Posix/sem_open.cpp


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
index 5681d8a3404d1..38762982f2d6a 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -6538,29 +6538,6 @@ INTERCEPTOR(int, sem_getvalue, __sanitizer_sem_t *s, int *sval) {
   }
   return res;
 }
-
-INTERCEPTOR(__sanitizer_sem_t *, sem_open, const char *name, int oflag, ...) {
-  void *ctx;
-  va_list ap;
-  va_start(ap, oflag);
-  u32 mode = va_arg(ap, u32);
-  u32 value = va_arg(ap, u32);
-  COMMON_INTERCEPTOR_ENTER(ctx, sem_open, name, oflag, mode, value);
-  COMMON_INTERCEPTOR_READ_RANGE(ctx, name, REAL(strlen)(name) + 1);
-  __sanitizer_sem_t *s = REAL(sem_open)(name, oflag, mode, value);
-  if (s)
-    COMMON_INTERCEPTOR_INITIALIZE_RANGE(s, sizeof(*s));
-  va_end(ap);
-  return s;
-}
-
-INTERCEPTOR(int, sem_unlink, const char *name) {
-  void *ctx;
-  COMMON_INTERCEPTOR_ENTER(ctx, sem_unlink, name);
-  COMMON_INTERCEPTOR_READ_RANGE(ctx, name, REAL(strlen)(name) + 1);
-  return REAL(sem_unlink)(name);
-}
-
 #  define INIT_SEM                            \
     COMMON_INTERCEPT_FUNCTION(sem_init);      \
     COMMON_INTERCEPT_FUNCTION(sem_destroy);   \
@@ -6568,9 +6545,7 @@ INTERCEPTOR(int, sem_unlink, const char *name) {
     COMMON_INTERCEPT_FUNCTION(sem_trywait);   \
     COMMON_INTERCEPT_FUNCTION(sem_timedwait); \
     COMMON_INTERCEPT_FUNCTION(sem_post);      \
-    COMMON_INTERCEPT_FUNCTION(sem_getvalue);  \
-    COMMON_INTERCEPT_FUNCTION(sem_open);      \
-    COMMON_INTERCEPT_FUNCTION(sem_unlink);
+    COMMON_INTERCEPT_FUNCTION(sem_getvalue);
 #else
 #  define INIT_SEM
 #endif  // SANITIZER_INTERCEPT_SEM

diff  --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/sem_open.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/sem_open.cpp
deleted file mode 100644
index 24a8f9fa2747e..0000000000000
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/sem_open.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// RUN: %clangxx -O0 %s -o %t && %run %t
-
-#include <assert.h>
-#include <fcntl.h>
-#include <semaphore.h>
-#include <stdio.h>
-#include <unistd.h>
-
-int main() {
-  char name[1024];
-  sprintf(name, "/sem_open_test_%d", getpid());
-
-  sem_t *s1 = sem_open(name, O_CREAT, 0644, 123);
-  assert(s1 != SEM_FAILED);
-
-  sem_t *s2 = sem_open(name, O_CREAT, 0644, 123);
-  assert(s2 != SEM_FAILED);
-
-  assert(sem_close(s1) == 0);
-  assert(sem_close(s2) == 0);
-
-  assert(sem_unlink(name) == 0);
-}