diff options
| author | John Wiegley | 2012-06-26 22:49:35 -0500 |
|---|---|---|
| committer | John Wiegley | 2012-06-26 22:49:35 -0500 |
| commit | ed6b35106553c615b210a12b51a7ebb57aaa82e4 (patch) | |
| tree | 1fb6428bc308fb1e83e38b30775f0bdb93ed8777 /src | |
| parent | 65400531235c557072dbdb2a793bc892df009f82 (diff) | |
| download | emacs-ed6b35106553c615b210a12b51a7ebb57aaa82e4.tar.gz emacs-ed6b35106553c615b210a12b51a7ebb57aaa82e4.zip | |
alloc.c (mark_memory): Do not check with -faddress-sanitizer when
building with Clang.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/alloc.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9b412fd01e3..d0e226db5dd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-06-26 John Wiegley <johnw@newartisans.com> | ||
| 2 | |||
| 3 | * alloc.c (mark_memory): Do not check with -faddress-sanitizer | ||
| 4 | when building with Clang. | ||
| 5 | |||
| 1 | 2012-06-26 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2012-06-26 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * eval.c (Fapply): Allow calling it with a single argument. | 8 | * eval.c (Fapply): Allow calling it with a single argument. |
diff --git a/src/alloc.c b/src/alloc.c index 7f9574d43d1..e1fd479699a 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -4621,6 +4621,12 @@ mark_maybe_pointer (void *p) | |||
| 4621 | 4621 | ||
| 4622 | static void | 4622 | static void |
| 4623 | mark_memory (void *start, void *end) | 4623 | mark_memory (void *start, void *end) |
| 4624 | #ifdef __clang__ | ||
| 4625 | /* Do not allow -faddress-sanitizer to check this function, since it | ||
| 4626 | crosses the function stack boundary, and thus would yield many | ||
| 4627 | false positives. */ | ||
| 4628 | __attribute__((no_address_safety_analysis)) | ||
| 4629 | #endif | ||
| 4624 | { | 4630 | { |
| 4625 | void **pp; | 4631 | void **pp; |
| 4626 | int i; | 4632 | int i; |