[Emacs-diffs] /srv/bzr/emacs/trunk r109016: alloc.c (mark_memory): Guard the "no_address_safety_analysis" function

[John Wiegley]

------------------------------------------------------------
revno: 109016
committer: John Wiegley <address@hidden>
branch nick: trunk
timestamp: Wed 2012-07-11 01:14:27 -0500
message:
  alloc.c (mark_memory): Guard the "no_address_safety_analysis" function
  attribute, so we only use it if it exists in the compiler.
modified:
  src/ChangeLog
  src/alloc.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-11 06:14:19 +0000
+++ b/src/ChangeLog     2012-07-11 06:14:27 +0000
@@ -1,3 +1,9 @@
+2012-07-11  John Wiegley  <address@hidden>
+
+       * alloc.c (mark_memory): Guard the "no_address_safety_analysis"
+       function attribute, so we only use it if it exists in the
+       compiler.
+
 2012-07-11  Dmitry Antipov  <address@hidden>
 
        Avoid call to strlen in fast_c_string_match_ignore_case.

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2012-07-10 23:24:36 +0000
+++ b/src/alloc.c       2012-07-11 06:14:27 +0000
@@ -4641,12 +4641,14 @@
 
 static void
 mark_memory (void *start, void *end)
-#ifdef __clang__
+#if defined (__clang__) && defined (__has_feature)
+#if __has_feature(address_sanitizer)
   /* 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
+#endif
 {
   void **pp;
   int i;