Use a more precise check for '__lsan_ignore_object'

* configure.ac: Add check for __lsan_ignore_object.

* src/buffer.c (enlarge_buffer_text):
* src/data.c (make_blv):
* src/emacs-module.c (Fmodule_load, initialize_environment):
* src/regex-emacs.c (regex_compile):
* src/search.c (newline_cache_on_off): Use new configuration macro.

diff --git a/configure.ac b/configure.ac
index b4674e3204b20a68a5e5cfcf9b19a5639b884867..93463e344ab1bf20b5d36ff9572ccf2d270a13bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4516,7 +4516,7 @@ AC_CHECK_FUNCS_ONCE([sbrk])
 
 AC_FUNC_FORK
 
-AC_CHECK_FUNCS(snprintf)
+AC_CHECK_FUNCS(snprintf __lsan_ignore_object)
 
 dnl Check for glib.  This differs from other library checks in that
 dnl Emacs need not link to glib unless some other library is already

diff --git a/src/buffer.c b/src/buffer.c
index 3456a46be3e463f9ac828e1880cc149fbe084878..e441499aeb03248311c4df5dda9743ed436d69d8 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5087,7 +5087,7 @@ enlarge_buffer_text (struct buffer *b, ptrdiff_t delta)
 #else
   p = xrealloc (b->text->beg, new_nbytes);
 #endif
-#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H
+#ifdef HAVE___LSAN_IGNORE_OBJECT
   __lsan_ignore_object (p);
 #endif
 

diff --git a/src/data.c b/src/data.c
index c261e8e90dd721dc9ddf64baf3a25ac1e1742710..5fff52d24c251fe7c8f8a63db9e9430f175a7af1 100644 (file)
--- a/src/data.c
+++ b/src/data.c
@@ -1788,7 +1788,7 @@ make_blv (struct Lisp_Symbol *sym, bool forwarded,
   set_blv_defcell (blv, tem);
   set_blv_valcell (blv, tem);
   set_blv_found (blv, false);
-#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H
+#ifdef HAVE___LSAN_IGNORE_OBJECT
   __lsan_ignore_object (blv);
 #endif
   return blv;

diff --git a/src/emacs-module.c b/src/emacs-module.c
index 4374bf4b1c45cfac7b7159384ad0a32fee1a5122..f57101946b3630f5bba8ee17ed33f2ca999d926c 100644 (file)
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -1103,7 +1103,7 @@ DEFUN ("module-load", Fmodule_load, Smodule_load, 1, 1, 0,
   if (module_assertions)
     {
       rt = xmalloc (sizeof *rt);
-#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H
+#ifdef HAVE___LSAN_IGNORE_OBJECT
       __lsan_ignore_object (rt);
 #endif
     }
@@ -1426,7 +1426,7 @@ initialize_environment (emacs_env *env, struct emacs_env_private *priv)
   if (module_assertions)
     {
       env = xmalloc (sizeof *env);
-#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H
+#ifdef HAVE___LSAN_IGNORE_OBJECT
       __lsan_ignore_object (env);
 #endif
     }

diff --git a/src/regex-emacs.c b/src/regex-emacs.c
index 5c08c81c0b56072e0d537cb0fa2bb25e12898b0e..1ecbc74b96ce3b3da9b68c8580996f8f89f00917 100644 (file)
--- a/src/regex-emacs.c
+++ b/src/regex-emacs.c
@@ -1761,7 +1761,7 @@ regex_compile (re_char *pattern, ptrdiff_t size,
   /* Initialize the compile stack.  */
   compile_stack.stack = xmalloc (INIT_COMPILE_STACK_SIZE
                                 * sizeof *compile_stack.stack);
-#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H
+#ifdef HAVE___LSAN_IGNORE_OBJECT
   __lsan_ignore_object (compile_stack.stack);
 #endif
   compile_stack.size = INIT_COMPILE_STACK_SIZE;

diff --git a/src/search.c b/src/search.c
index ad5d0302932d6cebba92cd42236fbc9b9bff3313..7b74ff91480082263fc1041d4e941555133040d5 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -619,7 +619,7 @@ newline_cache_on_off (struct buffer *buf)
          if (base_buf->newline_cache == 0)
             {
               base_buf->newline_cache = new_region_cache ();
-#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H
+#ifdef HAVE___LSAN_IGNORE_OBJECT
               __lsan_ignore_object (base_buf->newline_cache);
 #endif
             }