* decl.c (start_decl): Set attributes before duplicate_decls call.

From-SVN: r28442

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 886401a2807150b16340426f48c8af415eb94fce..a52ccf076a1990daee3363a870b954020f218c65 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1999-08-03  Mumit Khan  <khan@xraylith.wisc.edu>
+
+       * decl.c (start_decl): Set attributes before duplicate_decls call.
+
 1999-08-02  Mark Mitchell  <mark@codesourcery.com>
 
        * Make-lang.in (CXX_SRCS): Add dump.c.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 46708ac1782b1632bdf5293bf97c5d29326e8b08..eedf277d0cf403e74a953f1e27a22b2138c92588 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -6974,6 +6974,13 @@ start_decl (declarator, declspecs, initialized, attributes, prefix_attributes)
       DECL_INITIAL (decl) = error_mark_node;
     }
 
+#ifdef SET_DEFAULT_DECL_ATTRIBUTES
+  SET_DEFAULT_DECL_ATTRIBUTES (decl, attributes);
+#endif
+  
+  /* Set attributes here so if duplicate decl, will have proper attributes.  */
+  cplus_decl_attributes (decl, attributes, prefix_attributes);
+
   if (context && TYPE_SIZE (complete_type (context)) != NULL_TREE)
     {
       push_nested_class (context, 2);
@@ -7031,13 +7038,6 @@ start_decl (declarator, declspecs, initialized, attributes, prefix_attributes)
                    decl);
     }
 
-#ifdef SET_DEFAULT_DECL_ATTRIBUTES
-  SET_DEFAULT_DECL_ATTRIBUTES (decl, attributes);
-#endif
-  
-  /* Set attributes here so if duplicate decl, will have proper attributes.  */
-  cplus_decl_attributes (decl, attributes, prefix_attributes);
-
   /* Add this decl to the current binding level, but not if it
      comes from another scope, e.g. a static member variable.
      TEM may equal DECL or it may be a previous decl of the same name.  */