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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e91d4251d8df456ee3062bafecb6d5571e4261a9..2d22a5984a49bb18e654b8ac101d9cd7a718e989 100644 (file)
--- 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 73f54d92809067ae43baa04bb9b4525a4e128668..30bfa8b6ef6a1bda4011fa342c2994d596b9261d 100644 (file)
--- 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 cfe8e6914fa6f77b6f50ca9119f06482a51cb5d9..9f90b343cc622c4f4c6ceea2620878df1e7acc18 100644 (file)
--- 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 (file)
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 {};