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

From-SVN: r28443

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fab9b07ae62952e14feb9efae77338c846dfb226..6f13d4708e2a1ceb0d95f184b8f4d2c060a52d3c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,8 +1,8 @@
-Wed Jul 28 21:39:31 PDT 1999 Jeff Law  (law@cygnus.com)
+1999-08-03  Mumit Khan  <khan@xraylith.wisc.edu>
 
-       * gcc-2.95 Released.
+       * decl.c (start_decl): Set attributes before duplicate_decls call.
 
-Sun Jul 25 23:40:51 PDT 1999 Jeff Law  (law@cygnus.com)
+Wed Jul 28 21:39:31 PDT 1999 Jeff Law  (law@cygnus.com)
 
        * gcc-2.95 Released.
 

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 24968d0a670c71e00b2a8d8742fbea07ce49f9aa..36f6baed068f12caa0c87639a20f45a7ae331473 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7339,6 +7339,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);
@@ -7396,13 +7403,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.  */