diff options
| author | Taras Glek <taras@mozilla.com> | 2009-12-02 17:50:41 +0000 |
|---|---|---|
| committer | Taras Glek <tglek@gcc.gnu.org> | 2009-12-02 17:50:41 +0000 |
| commit | 4b90314e2c790740fec39db21698b290d8e903d7 (patch) | |
| tree | a11c6cff52f26f5517593dcdffea6c105d775c72 /gcc | |
| parent | a881cad63500457e54cde728490e220e976cbb46 (diff) | |
| download | gcc-4b90314e2c790740fec39db21698b290d8e903d7.zip gcc-4b90314e2c790740fec39db21698b290d8e903d7.tar.gz gcc-4b90314e2c790740fec39db21698b290d8e903d7.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 2 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5cacf21..84ce5a5 100644 --- 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 b74f4f2..f65dda4 100644 --- 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 b382108..4c36280 100644 --- 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)); |