From: Ziemowit Laski <zlaski@apple.com>
Date: Fri, 10 Sep 2004 22:11:48 +0000 (+0000)
Subject: decl.c (objc_mark_locals_volatile): Make description of routine more descriptive...
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f749f3c20da104deba8c86dda00198643c3ddc94;p=gcc.git

decl.c (objc_mark_locals_volatile): Make description of routine more descriptive...

[gcc/cp/ChangeLog]
2004-09-10  Ziemowit Laski  <zlaski@apple.com>

        * decl.c (objc_mark_locals_volatile): Make description of
        routine more descriptive; only mark VAR_DECLs at each
        binding level.

From-SVN: r87323
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 42660e8d9f6..ca0af251ce0 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-10  Ziemowit Laski  <zlaski@apple.com>
+
+        * decl.c (objc_mark_locals_volatile): Make description of 
+	routine more descriptive; only mark VAR_DECLs at each
+	binding level.
+
 2004-09-10  Richard Henderson  <rth@redhat.com>
 
 	PR c++/17386
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index f2d8fc2f564..0aec597fefe 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -414,7 +414,9 @@ objc_get_current_scope (void)
 
 /* The following routine is used by the NeXT-style SJLJ exceptions;
    variables get marked 'volatile' so as to not be clobbered by
-   _setjmp()/_longjmp() calls.  */
+   _setjmp()/_longjmp() calls.  All variables in the current scope,
+   as well as parent scopes up to (but not including) ENCLOSING_BLK
+   shall be thusly marked.  */
 
 void
 objc_mark_locals_volatile (void *enclosing_blk)
@@ -429,8 +431,11 @@ objc_mark_locals_volatile (void *enclosing_blk)
 
       for (decl = scope->names; decl; decl = TREE_CHAIN (decl))
         {
-          DECL_REGISTER (decl) = 0;
-          TREE_THIS_VOLATILE (decl) = 1;
+	  if (TREE_CODE (decl) == VAR_DECL)
+	    {
+              DECL_REGISTER (decl) = 0;
+              TREE_THIS_VOLATILE (decl) = 1;
+	    }
         }
     }
 }