aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPhilipp Stephani2020-08-01 17:12:30 +0200
committerPhilipp Stephani2020-08-01 17:12:30 +0200
commit06310cf9122500faa96ad200888cfbb1dda56563 (patch)
treeeb7065cdedd8deef2cb55130bf8ff7de305112a9 /src
parenta2323c7ccb0eab1b6395d5d1d7e18db617354e13 (diff)
downloademacs-06310cf9122500faa96ad200888cfbb1dda56563.tar.gz
emacs-06310cf9122500faa96ad200888cfbb1dda56563.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/buffer.c2
-rw-r--r--src/data.c2
-rw-r--r--src/emacs-module.c4
-rw-r--r--src/regex-emacs.c2
-rw-r--r--src/search.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 3456a46be3e..e441499aeb0 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5087,7 +5087,7 @@ enlarge_buffer_text (struct buffer *b, ptrdiff_t delta)
5087#else 5087#else
5088 p = xrealloc (b->text->beg, new_nbytes); 5088 p = xrealloc (b->text->beg, new_nbytes);
5089#endif 5089#endif
5090#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H 5090#ifdef HAVE___LSAN_IGNORE_OBJECT
5091 __lsan_ignore_object (p); 5091 __lsan_ignore_object (p);
5092#endif 5092#endif
5093 5093
diff --git a/src/data.c b/src/data.c
index c261e8e90dd..5fff52d24c2 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1788,7 +1788,7 @@ make_blv (struct Lisp_Symbol *sym, bool forwarded,
1788 set_blv_defcell (blv, tem); 1788 set_blv_defcell (blv, tem);
1789 set_blv_valcell (blv, tem); 1789 set_blv_valcell (blv, tem);
1790 set_blv_found (blv, false); 1790 set_blv_found (blv, false);
1791#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H 1791#ifdef HAVE___LSAN_IGNORE_OBJECT
1792 __lsan_ignore_object (blv); 1792 __lsan_ignore_object (blv);
1793#endif 1793#endif
1794 return blv; 1794 return blv;
diff --git a/src/emacs-module.c b/src/emacs-module.c
index 4374bf4b1c4..f57101946b3 100644
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -1103,7 +1103,7 @@ DEFUN ("module-load", Fmodule_load, Smodule_load, 1, 1, 0,
1103 if (module_assertions) 1103 if (module_assertions)
1104 { 1104 {
1105 rt = xmalloc (sizeof *rt); 1105 rt = xmalloc (sizeof *rt);
1106#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H 1106#ifdef HAVE___LSAN_IGNORE_OBJECT
1107 __lsan_ignore_object (rt); 1107 __lsan_ignore_object (rt);
1108#endif 1108#endif
1109 } 1109 }
@@ -1426,7 +1426,7 @@ initialize_environment (emacs_env *env, struct emacs_env_private *priv)
1426 if (module_assertions) 1426 if (module_assertions)
1427 { 1427 {
1428 env = xmalloc (sizeof *env); 1428 env = xmalloc (sizeof *env);
1429#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H 1429#ifdef HAVE___LSAN_IGNORE_OBJECT
1430 __lsan_ignore_object (env); 1430 __lsan_ignore_object (env);
1431#endif 1431#endif
1432 } 1432 }
diff --git a/src/regex-emacs.c b/src/regex-emacs.c
index 5c08c81c0b5..1ecbc74b96c 100644
--- a/src/regex-emacs.c
+++ b/src/regex-emacs.c
@@ -1761,7 +1761,7 @@ regex_compile (re_char *pattern, ptrdiff_t size,
1761 /* Initialize the compile stack. */ 1761 /* Initialize the compile stack. */
1762 compile_stack.stack = xmalloc (INIT_COMPILE_STACK_SIZE 1762 compile_stack.stack = xmalloc (INIT_COMPILE_STACK_SIZE
1763 * sizeof *compile_stack.stack); 1763 * sizeof *compile_stack.stack);
1764#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H 1764#ifdef HAVE___LSAN_IGNORE_OBJECT
1765 __lsan_ignore_object (compile_stack.stack); 1765 __lsan_ignore_object (compile_stack.stack);
1766#endif 1766#endif
1767 compile_stack.size = INIT_COMPILE_STACK_SIZE; 1767 compile_stack.size = INIT_COMPILE_STACK_SIZE;
diff --git a/src/search.c b/src/search.c
index ad5d0302932..7b74ff91480 100644
--- a/src/search.c
+++ b/src/search.c
@@ -619,7 +619,7 @@ newline_cache_on_off (struct buffer *buf)
619 if (base_buf->newline_cache == 0) 619 if (base_buf->newline_cache == 0)
620 { 620 {
621 base_buf->newline_cache = new_region_cache (); 621 base_buf->newline_cache = new_region_cache ();
622#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H 622#ifdef HAVE___LSAN_IGNORE_OBJECT
623 __lsan_ignore_object (base_buf->newline_cache); 623 __lsan_ignore_object (base_buf->newline_cache);
624#endif 624#endif
625 } 625 }