summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/alloc.c6
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 @@
+2012-06-26 John Wiegley <johnw@newartisans.com>
+
+ * alloc.c (mark_memory): Do not check with -faddress-sanitizer
+ when building with Clang.
+
2012-06-26 Stefan Monnier <monnier@iro.umontreal.ca>
* 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)
static void
mark_memory (void *start, void *end)
+#ifdef __clang__
+ /* Do not allow -faddress-sanitizer to check this function, since it
+ crosses the function stack boundary, and thus would yield many
+ false positives. */
+ __attribute__((no_address_safety_analysis))
+#endif
{
void **pp;
int i;