diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parse.y | 9 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 20 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.other/base1.C | 20 |
5 files changed, 42 insertions, 17 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9d486f6a59c..e0c75484634 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2000-11-28 Nathan Sidwell <nathan@codesourcery.com> + * parse.y (base_class.1): Produce a _TYPE not a _DECL. + * semantics.c (finish_base_specifier): Accept a _TYPE not a + _DECL. + +2000-11-28 Nathan Sidwell <nathan@codesourcery.com> + * spew.c (yyerror): Cope if yylval.ttype is NULL. 2000-11-28 Nathan Sidwell <nathan@codesourcery.com> diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y index 9e32911058f..4c03dc74c03 100644 --- a/gcc/cp/parse.y +++ b/gcc/cp/parse.y @@ -2460,13 +2460,10 @@ base_class: base_class.1: typename_sub - { if ($$ == error_mark_node) - ; - else if (!TYPE_P ($$)) - $$ = error_mark_node; - else - $$ = TYPE_MAIN_DECL ($1); } + { if (!TYPE_P ($$)) + $$ = error_mark_node; } | nonnested_type + { $$ = TREE_TYPE ($$); } ; base_class_access_list: diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 8d22ce2e70e..8502eeff102 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -2068,21 +2068,19 @@ finish_base_specifier (access_specifier, base_class) tree access_specifier; tree base_class; { - tree type; tree result; - if (base_class == NULL_TREE) - { - error ("invalid base class"); - type = error_mark_node; - } - else - type = TREE_TYPE (base_class); - - if (! is_aggr_type (type, 1)) + if (! is_aggr_type (base_class, 1)) result = NULL_TREE; else - result = build_tree_list (access_specifier, type); + { + if (CP_TYPE_QUALS (base_class) != 0) + { + cp_error ("base class `%T' has cv qualifiers", base_class); + base_class = TYPE_MAIN_VARIANT (base_class); + } + result = build_tree_list (access_specifier, base_class); + } return result; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 06f689b7083..f60af3fdc82 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2000-11-28 Nathan Sidwell <nathan@codesourcery.com> + * g++.old-deja/g++.other/base1.C: New test. + +2000-11-28 Nathan Sidwell <nathan@codesourcery.com> + * g++.old-deja/g++.other/parse2.C: New test. 2000-11-28 Nathan Sidwell <nathan@codesourcery.com> diff --git a/gcc/testsuite/g++.old-deja/g++.other/base1.C b/gcc/testsuite/g++.old-deja/g++.other/base1.C new file mode 100644 index 00000000000..ace821c4e5c --- /dev/null +++ b/gcc/testsuite/g++.old-deja/g++.other/base1.C @@ -0,0 +1,20 @@ +// Build don't link: + +// Copyright (C) 2000 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 25 Nov 2000 <nathan@codesourcery.com> + +// We lost information about which base wasn't an aggregate type, plus we +// allowed cv qualifed bases via typedefs. + +typedef int I; +typedef int cI; + +struct A {}; + +typedef const A cA; +typedef A pA; + +struct B : I {}; // ERROR - not an aggregate +struct C : cI {}; // ERROR - not an aggregate +struct D : cA {}; // ERROR - cv qualified +struct E : pA {}; |
