re PR c++/30297 (ICE with extern "C" and inheritance)

gcc/cp
2007-11-08  Andrew Pinski  <pinskia@gmail.com>
	PR c++/30297:
	* tree.c (decl_linkage): Fields have no linkage.
gcc/testsuite
	PR c++/30297:
	* g++.dg/inherit/pr30297.C: New file.

From-SVN: r130018

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e28f5822d4b119fd83c171f15738c6a849221ac0..3a99fbaadacc230684ab82f5ec200e2c570f969e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-08  Andrew Pinski  <pinskia@gmail.com>
+
+       PR c++/30297:
+       * tree.c (decl_linkage): Fields have no linkage.
+
 2007-11-08  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * class.c (build_ctor_vtbl_group): Lay out the new type and decl.

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index c2b4af04086b6d80d3cdf0e89710a139e36a121d..2a7cd3af747dbd4ccf7ff79d495ba143a10cbd77 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -2493,6 +2493,10 @@ decl_linkage (tree decl)
   if (!DECL_NAME (decl))
     return lk_none;
 
+  /* Fields have no linkage.  */
+  if (TREE_CODE (decl) == FIELD_DECL)
+    return lk_none;
+
   /* Things that are TREE_PUBLIC have external linkage.  */
   if (TREE_PUBLIC (decl))
     return lk_external;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e04e5e1ae0464edc590556fee96a08bc2cbec060..ede1c09b21357d45e7351df96a9213c6703dee6a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-08  Tom Tromey  <tromey@redhat.com>
+
+       PR c++/30297:
+       * g++.dg/inherit/pr30297.C: New file.
+
 2007-11-08  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * gcc.dg/compat/struct-layout-1_generate.c (dg-options) Add

diff --git a/gcc/testsuite/g++.dg/inherit/pr30297.C b/gcc/testsuite/g++.dg/inherit/pr30297.C
new file mode 100644 (file)
index 0000000..222d9ab
--- /dev/null
+++ b/gcc/testsuite/g++.dg/inherit/pr30297.C
@@ -0,0 +1,11 @@
+// Regression test for ICE from PR c++/30297.
+
+struct A
+{
+  int i;
+};
+
+extern "C" struct B : A
+{
+  A::i;
+};