From 8a72b0059569406bfc9dd9811f6ef48206ccc75a Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Wed, 5 Oct 2016 11:32:00 +0300
Subject: [PATCH] Eliminate 'address of local variable returned' static
 analyzer warning

* mark_rts.c [__GNUC__ >= 4] (GC_approx_sp): Use
__builtin_frame_address(0) instead of &sp (but still write the value to
the volatile local variable to force stack to grow if necessary).
* tools/setjmp_t.c [__GNUC__ >= 4] (nested_sp): Return
__builtin_frame_address(0) instead of sp.
---
 mark_rts.c       | 8 +++++---
 tools/setjmp_t.c | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/mark_rts.c b/mark_rts.c
index a5b8b08..055c1dc 100644
--- a/mark_rts.c
+++ b/mark_rts.c
@@ -386,13 +386,15 @@ STATIC void GC_remove_tmp_roots(void)
 GC_INNER ptr_t GC_approx_sp(void)
 {
     volatile word sp;
-    sp = (word)&sp;
+#   if defined(__GNUC__) && (__GNUC__ >= 4)
+        sp = (word)__builtin_frame_address(0);
+#   else
+        sp = (word)&sp;
+#   endif
                 /* Also force stack to grow if necessary. Otherwise the */
                 /* later accesses might cause the kernel to think we're */
                 /* doing something wrong.                               */
     return((ptr_t)sp);
-                /* GNU C: alternatively, we may return the value of     */
-                /*__builtin_frame_address(0).                           */
 }
 
 /*
diff --git a/tools/setjmp_t.c b/tools/setjmp_t.c
index 1bd715d..c71aea6 100644
--- a/tools/setjmp_t.c
+++ b/tools/setjmp_t.c
@@ -62,9 +62,13 @@ struct {
 
 word nested_sp(void)
 {
+# if defined(__GNUC__) && (__GNUC__ >= 4)
+    return (word)__builtin_frame_address(0);
+# else
     volatile word sp;
     sp = (word)(&sp);
     return sp;
+# endif
 }
 
 /* To prevent nested_sp inlining. */
-- 
2.7.4