[PATCH] D56009: [Sanitizer] Enable POSIX regex api on FreeBSD

[David CARLIER via Phabricator via llvm-commits]

devnexen created this revision.
devnexen added a reviewer: krytarowski.
devnexen created this object with visibility "All Users".
Herald added subscribers: Sanitizers, llvm-commits, fedor.sergeev, kubamracek, emaste.

Repository:
  rCRT Compiler Runtime

https://reviews.llvm.org/D56009

Files:
  lib/sanitizer_common/sanitizer_platform_interceptors.h
  lib/sanitizer_common/sanitizer_platform_limits_freebsd.cc
  lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
  test/sanitizer_common/TestCases/NetBSD/regex.cc
  test/sanitizer_common/TestCases/Posix/regex.cc


Index: test/sanitizer_common/TestCases/Posix/regex.cc
===================================================================
--- test/sanitizer_common/TestCases/Posix/regex.cc
+++ test/sanitizer_common/TestCases/Posix/regex.cc
@@ -1,4 +1,6 @@
 // RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
+//
+// UNSUPPORTED: linux, darwin, solaris
 
 #include <assert.h>
 #include <regex.h>
Index: lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
===================================================================
--- lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
+++ lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
@@ -62,6 +62,8 @@
   extern unsigned struct_rlimit_sz;
   extern unsigned struct_utimbuf_sz;
   extern unsigned struct_timespec_sz;
+  extern unsigned struct_regmatch_sz;
+  extern unsigned struct_regex_sz;
   extern const int unvis_valid;
   extern const int unvis_validpush;
 
Index: lib/sanitizer_common/sanitizer_platform_limits_freebsd.cc
===================================================================
--- lib/sanitizer_common/sanitizer_platform_limits_freebsd.cc
+++ lib/sanitizer_common/sanitizer_platform_limits_freebsd.cc
@@ -25,6 +25,7 @@
 #include <poll.h>
 #include <pthread.h>
 #include <pwd.h>
+#include <regex.h>
 #include <signal.h>
 #include <stddef.h>
 #include <sys/mman.h>
@@ -61,6 +62,7 @@
 #include <net/ethernet.h>
 #include <net/ppp_defs.h>
 #include <glob.h>
+#include <regex.h>
 #include <stdio.h>
 #include <term.h>
 #include <utmpx.h>
@@ -125,6 +127,8 @@
   unsigned struct_statvfs_sz = sizeof(struct statvfs);
   unsigned struct_shminfo_sz = sizeof(struct shminfo);
   unsigned struct_shm_info_sz = sizeof(struct shm_info);
+  unsigned struct_regmatch_sz = sizeof(regmatch_t);
+  unsigned struct_regex_sz = sizeof(regex_t);
 
   const uptr sig_ign = (uptr)SIG_IGN;
   const uptr sig_dfl = (uptr)SIG_DFL;
Index: lib/sanitizer_common/sanitizer_platform_interceptors.h
===================================================================
--- lib/sanitizer_common/sanitizer_platform_interceptors.h
+++ lib/sanitizer_common/sanitizer_platform_interceptors.h
@@ -522,7 +522,7 @@
 #define SANITIZER_INTERCEPT_GETMNTINFO (SI_NETBSD || SI_FREEBSD || SI_MAC)
 #define SANITIZER_INTERCEPT_MI_VECTOR_HASH SI_NETBSD
 #define SANITIZER_INTERCEPT_GETVFSSTAT SI_NETBSD
-#define SANITIZER_INTERCEPT_REGEX SI_NETBSD
+#define SANITIZER_INTERCEPT_REGEX (SI_NETBSD || SI_FREEBSD)
 #define SANITIZER_INTERCEPT_FTS SI_NETBSD
 #define SANITIZER_INTERCEPT_SYSCTL (SI_NETBSD || SI_FREEBSD || SI_MAC)
 #define SANITIZER_INTERCEPT_ASYSCTL SI_NETBSD


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D56009.179299.patch
Type: text/x-patch
Size: 2600 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181221/47d4cf18/attachment.bin>