git: 31aedef26fc0 - main - Merge commit 16a1ef86cbc5 from llvm-project (by David CARLIER):

The branch main has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=31aedef26fc0613f5d61204c624451d57e716ed9

commit 31aedef26fc0613f5d61204c624451d57e716ed9
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-01-27 21:48:58 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-01-27 21:48:58 +0000

    Merge commit 16a1ef86cbc5 from llvm-project (by David CARLIER):
    
      [compiler-rt] remove hexdump interception. (#79378)
    
      a freebsd dev member reported a symbol conflict and intercepting this
      had little value anyway.
    
    This is one part of fixing the WITH_ASAN build. Some executables in the
    base system define their own hexdump() symbol, which would otherwise
    conflict with the ASan-intercepted one.
    
    Reported by:    markj
    PR:             276597
    MFC after:      3 days
---
 .../sanitizer_common/sanitizer_common_interceptors.inc    | 15 ---------------
 .../sanitizer_common/sanitizer_platform_interceptors.h    |  1 -
 2 files changed, 16 deletions(-)

diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
index 0e563fa12022..a6cda8c6bd4f 100644
--- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -10180,20 +10180,6 @@ INTERCEPTOR(int, __xuname, int size, void *utsname) {
 #define INIT___XUNAME
 #endif
 
-#if SANITIZER_INTERCEPT_HEXDUMP
-INTERCEPTOR(void, hexdump, const void *ptr, int length, const char *header, int flags) {
-  void *ctx;
-  COMMON_INTERCEPTOR_ENTER(ctx, hexdump, ptr, length, header, flags);
-  COMMON_INTERCEPTOR_READ_RANGE(ctx, ptr, length);
-  COMMON_INTERCEPTOR_READ_RANGE(ctx, header, internal_strlen(header) + 1);
-  REAL(hexdump)(ptr, length, header, flags);
-}
-
-#define INIT_HEXDUMP COMMON_INTERCEPT_FUNCTION(hexdump);
-#else
-#define INIT_HEXDUMP
-#endif
-
 #if SANITIZER_INTERCEPT_ARGP_PARSE
 INTERCEPTOR(int, argp_parse, const struct argp *argp, int argc, char **argv,
             unsigned flags, int *arg_index, void *input) {
@@ -10543,7 +10529,6 @@ static void InitializeCommonInterceptors() {
   INIT_PROCCTL
   INIT_UNAME;
   INIT___XUNAME;
-  INIT_HEXDUMP;
   INIT_ARGP_PARSE;
   INIT_CPUSET_GETAFFINITY;
 
diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
index c740778b6228..d7fe7e29b105 100644
--- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
+++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
@@ -594,7 +594,6 @@
 #define SANITIZER_INTERCEPT___XUNAME SI_FREEBSD
 #define SANITIZER_INTERCEPT_FLOPEN SI_FREEBSD
 #define SANITIZER_INTERCEPT_PROCCTL SI_FREEBSD
-#define SANITIZER_INTERCEPT_HEXDUMP SI_FREEBSD
 #define SANITIZER_INTERCEPT_ARGP_PARSE SI_GLIBC
 #define SANITIZER_INTERCEPT_CPUSET_GETAFFINITY SI_FREEBSD