From: Alexandre Oliva <aoliva@redhat.com>
Date: Tue, 18 Jul 2000 17:53:35 +0000 (+0000)
Subject: c-decl.c (duplicate_decls): Do not call make_var_volatile() in case of invalid volati... 
X-Git-Tag: prereleases/libstdc++-2.92~5260
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79c282037d19cfd0c9cb1de06dc019a66c8e0d8b;p=thirdparty%2Fgcc.git

c-decl.c (duplicate_decls): Do not call make_var_volatile() in case of invalid volatile re-declaration.

* c-decl.c (duplicate_decls): Do not call make_var_volatile() in
case of invalid volatile re-declaration.

From-SVN: r35119
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b183280c9929..a8cd839fd917 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	* c-decl.c (duplicate_decls): Do not call make_var_volatile() in
+	case of invalid volatile re-declaration.
+
 2000-07-18  Jakub Jelinek  <jakub@redhat.com>
 
 	* calls.c (store_arg): Return non-zero if sibcall_failure is
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index b759fd5e3ae4..c2bbb95c5fed 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -1843,7 +1843,14 @@ duplicate_decls (newdecl, olddecl, different_binding_level)
       if (TREE_THIS_VOLATILE (newdecl))
 	{
 	  TREE_THIS_VOLATILE (write_olddecl) = 1;
-	  if (TREE_CODE (newdecl) == VAR_DECL)
+	  if (TREE_CODE (newdecl) == VAR_DECL
+	      /* If an automatic variable is re-declared in the same
+		 function scope, but the old declaration was not
+		 volatile, make_var_volatile() would crash because the
+		 variable would have been assigned to a pseudo, not a
+		 MEM.  Since this duplicate declaration is invalid
+		 anyway, we just skip the call.  */
+	      && errmsg == 0)
 	    make_var_volatile (newdecl);
 	}