diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 1 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 15 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/error1.C | 6 |
6 files changed, 20 insertions, 17 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 03c02c4..7e74f47 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2003-06-11 Mark Mitchell <mark@codesourcery.com> + + PR c++/10432 + * cp-tree.h (finish_declarator): Remove. + * decl.c (cp_finish_decl): Make sure to pop_nested_class even for + erroneous declarations. + * semantics.c (finish_declarator): Remove. + 2003-06-11 Roger Sayle <roger@eyesopen.com> * decl2.c (generate_ctor_or_dtor_function): Avoid expanding a diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 4639e17..244eb1a 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -4118,7 +4118,6 @@ extern tree finish_unary_op_expr (enum tree_code, tree); extern tree finish_compound_literal (tree, tree); extern tree finish_fname (tree); extern int begin_function_definition (tree, tree, tree); -extern tree finish_declarator (tree, tree, tree, tree, int); extern void finish_translation_unit (void); extern tree finish_template_type_parm (tree, tree); extern tree finish_template_template_parm (tree, tree); diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 1340640..f318551 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -8023,7 +8023,7 @@ cp_finish_decl (tree decl, tree init, tree asmspec_tree, int flags) type = TREE_TYPE (decl); if (type == error_mark_node) - return; + goto finish_end0; if (TYPE_HAS_MUTABLE_P (type)) TREE_READONLY (decl) = 0; diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index be524be..646cc19 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -1739,21 +1739,6 @@ begin_function_definition (decl_specs, attributes, declarator) return 1; } -/* Finish an init-declarator. Returns a DECL. */ - -tree -finish_declarator (declarator, declspecs, attributes, - prefix_attributes, initialized) - tree declarator; - tree declspecs; - tree attributes; - tree prefix_attributes; - int initialized; -{ - return start_decl (declarator, declspecs, initialized, attributes, - prefix_attributes); -} - /* Finish a translation unit. */ void diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f5ca84b..52b54cb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2003-06-11 Mark Mitchell <mark@codesourcery.com> + + PR c++/10432 + * g++.dg/parse/error1.C: New test. + 2003-06-11 Janis Johnson <janis187@us.ibm.com> * gcc.dg/compat/struct-by-value-11_main.c: New file. diff --git a/gcc/testsuite/g++.dg/parse/error1.C b/gcc/testsuite/g++.dg/parse/error1.C new file mode 100644 index 0000000..8756df6 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/error1.C @@ -0,0 +1,6 @@ +struct INCOMPLETE; +template <int> struct X { + static INCOMPLETE value; +}; +template <> INCOMPLETE X<1>::value = 0; // { dg-error "" } + |