parser.c (cp_parser_class_specifier): Back out my previous change.

	* parser.c (cp_parser_class_specifier): Back out my previous change.
	* semantics.c (begin_class_definition): Back out my previous change.

From-SVN: r154919

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5cacf21468cca46b9dbb0e5d49e430e59fcae300..84ce5a5a64375c8669b9872f9d6d06e358219140 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-02  Taras Glek  <taras@mozilla.com>
+
+       * parser.c (cp_parser_class_specifier): Back out my previous change.
+       * semantics.c (begin_class_definition): Back out my previous change.
+
 2009-12-02  Paolo Bonzini  <bonzini@gnu.org>
            Shujing Zhao  <pearly.zhao@oracle.com>
 

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index b74f4f23c673d32edd3e6c6a5ed4b03725a572d8..f65dda48cc73512a76f2322454acd31384577edf 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -16376,8 +16376,6 @@ cp_parser_class_head (cp_parser* parser,
       end_specialization ();
       --parser->num_template_parameter_lists;
     }
-
-  DECL_SOURCE_LOCATION (TYPE_NAME (type)) = type_start_token->location;
   *attributes_p = attributes;
   return type;
 }

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index b3821087ac79a17cf7e5066a0996e0de5ca2f030..4c3628034b3e4239e6744b8c2516700225f1f003 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2386,6 +2386,9 @@ begin_class_definition (tree t, tree attributes)
       pushtag (make_anon_name (), t, /*tag_scope=*/ts_current);
     }
 
+  /* Update the location of the decl.  */
+  DECL_SOURCE_LOCATION (TYPE_NAME (t)) = input_location;
+
   if (TYPE_BEING_DEFINED (t))
     {
       t = make_class_type (TREE_CODE (t));