From: Richard Kenner <kenner@gcc.gnu.org>
Date: Fri, 11 Nov 1994 22:53:39 +0000 (-0500)
Subject: (duplicate_decls): Properly merge decls with differing DECL_CONTEXT.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e3c56d1b513077e7b7c4e0face59484e8597a8f4;p=gcc.git

(duplicate_decls): Properly merge decls with differing DECL_CONTEXT.

From-SVN: r8428
---

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 995009a4635..427ff3a7d37 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -1698,11 +1698,16 @@ duplicate_decls (newdecl, olddecl)
 	    make_var_volatile (newdecl);
 	}
 
-      /* Keep source location of definition rather than declaration.  */
-      if (DECL_INITIAL (newdecl) == 0 && DECL_INITIAL (olddecl) != 0)
+      /* Keep source location of definition rather than declaration.
+	 Likewise, keep decl at outer scope.  */
+      if ((DECL_INITIAL (newdecl) == 0 && DECL_INITIAL (olddecl) != 0)
+	  || (DECL_CONTEXT (newdecl) != 0 && DECL_CONTEXT (olddecl) == 0))
 	{
 	  DECL_SOURCE_LINE (newdecl) = DECL_SOURCE_LINE (olddecl);
 	  DECL_SOURCE_FILE (newdecl) = DECL_SOURCE_FILE (olddecl);
+
+	  if (DECL_CONTEXT (olddecl) == 0)
+	    DECL_CONTEXT (newdecl) = 0;
 	}
 
       /* Merge the unused-warning information.  */