diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2004-09-23 10:09:09 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2004-09-23 10:09:09 +0000 |
| commit | 98d6e9afea98c81a0cb3fa9e1d5622d474dd52e1 (patch) | |
| tree | 9e32da01f4dd9f74821e87be2227b9646e5b67d7 /gcc | |
| parent | e5a067e81a6f05552064e2d1224c278724ba4ca6 (diff) | |
| download | gcc-98d6e9afea98c81a0cb3fa9e1d5622d474dd52e1.zip gcc-98d6e9afea98c81a0cb3fa9e1d5622d474dd52e1.tar.gz gcc-98d6e9afea98c81a0cb3fa9e1d5622d474dd52e1.tar.bz2 | |
re PR c++/17620 (Bogus error with duplicate base class breaks boost)
cp:
PR c++/17620
* decl.c (xref_basetypes): Look through typedefs before checking
for duplicate base.
testsuite:
PR c++/17620
* g++.dg/inherit/base2.C: New.
From-SVN: r87938
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 22 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/inherit/base2.C | 12 |
4 files changed, 35 insertions, 10 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e91d425..2d22a59 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2004-09-23 Nathan Sidwell <nathan@codesourcery.com> + + PR c++/17620 + * decl.c (xref_basetypes): Look through typedefs before checking + for duplicate base. + 2004-09-22 Nathan Sidwell <nathan@codesourcery.com> * cp-tree.h (unemitted_tinfo_decls): Make a VEC(tree). diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 73f54d9..30bfa8b 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -9286,16 +9286,6 @@ xref_basetypes (tree ref, tree base_list) continue; } - if (TYPE_MARKED_P (basetype)) - { - if (basetype == ref) - error ("recursive type `%T' undefined", basetype); - else - error ("duplicate base type `%T' invalid", basetype); - continue; - } - TYPE_MARKED_P (basetype) = 1; - if (TYPE_FOR_JAVA (basetype) && (current_lang_depth () == 0)) TYPE_FOR_JAVA (ref) = 1; @@ -9318,6 +9308,18 @@ xref_basetypes (tree ref, tree base_list) CLASSTYPE_REPEATED_BASE_P (ref) |= CLASSTYPE_REPEATED_BASE_P (basetype); } + + /* We must do this test after we've seen through a typedef + type. */ + if (TYPE_MARKED_P (basetype)) + { + if (basetype == ref) + error ("recursive type `%T' undefined", basetype); + else + error ("duplicate base type `%T' invalid", basetype); + continue; + } + TYPE_MARKED_P (basetype) = 1; base_binfo = copy_binfo (base_binfo, basetype, ref, &igo_prev, via_virtual); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cfe8e69..9f90b34 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-09-23 Nathan Sidwell <nathan@codesourcery.com> + + PR c++/17620 + * g++.dg/inherit/base2.C: New. + 2004-09-22 Eric Botcazou <ebotcazou@libertysurf.fr> * gcc.dg/20001012-1.c: Add prototypes for builtin functions. diff --git a/gcc/testsuite/g++.dg/inherit/base2.C b/gcc/testsuite/g++.dg/inherit/base2.C new file mode 100644 index 0000000..5c7d812 --- /dev/null +++ b/gcc/testsuite/g++.dg/inherit/base2.C @@ -0,0 +1,12 @@ +// Copyright (C) 2004 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 23 Sep 2004 <nathan@codesourcery.com> + +// Origin: Wolfgang Bangerth <bangerth@dealii.org> +// Bug 17620. Bogus duplicate base error. + +struct S {}; + +typedef S B; + +struct D1 : B {}; +struct D2 : B {}; |