From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 30 Aug 2011 04:30:42 +0000 (+0200)
Subject: re PR c++/50207 (G++ segv's on reduced test case)
X-Git-Tag: releases/gcc-4.7.0~4130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7b6bcf3571f919b67a91141d56ddac2c377bbb7;p=thirdparty%2Fgcc.git

re PR c++/50207 (G++ segv's on reduced test case)

	PR c++/50207
	* class.c (finish_struct_1): Complain if the first field is
	artificial.

Co-Authored-By: Jason Merrill <jason@redhat.com>

From-SVN: r178276
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d42d89a0a876..17065de265d2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-29  Jakub Jelinek  <jakub@redhat.com>
+	    Jason Merrill  <jason@redhat.com>
+
+	PR c++/50207
+	* class.c (finish_struct_1): Complain if the first field is
+	artificial.
+
 2011-08-29  Jason Merrill  <jason@redhat.com>
 
 	PR c++/50209
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 6ebe7588cb8f..2a4bc77aa5ee 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -5795,10 +5795,25 @@ finish_struct_1 (tree t)
   /* Finish debugging output for this type.  */
   rest_of_type_compilation (t, ! LOCAL_CLASS_P (t));
 
-  if (TYPE_TRANSPARENT_AGGR (t) && first_field (t) == NULL_TREE)
+  if (TYPE_TRANSPARENT_AGGR (t))
     {
-      error ("type transparent class %qT does not have any fields", t);
-      TYPE_TRANSPARENT_AGGR (t) = 0;
+      tree field = first_field (t);
+      if (field == NULL_TREE || error_operand_p (field))
+	{
+	  error ("type transparent class %qT does not have any fields", t);
+	  TYPE_TRANSPARENT_AGGR (t) = 0;
+	}
+      else if (DECL_ARTIFICIAL (field))
+	{
+	  if (DECL_FIELD_IS_BASE (field))
+	    error ("type transparent class %qT has base classes", t);
+	  else
+	    {
+	      gcc_checking_assert (DECL_VIRTUAL_P (field));
+	      error ("type transparent class %qT has virtual functions", t);
+	    }
+	  TYPE_TRANSPARENT_AGGR (t) = 0;
+	}
     }
 }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c5208afe0e06..c503b69046db 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-29  Jakub Jelinek  <jakub@redhat.com>
+	    Jason Merrill  <jason@redhat.com>
+
+	* g++.dg/dfp/base.C: New test.
+
 2011-08-29  Jason Merrill  <jason@redhat.com>
 
 	Core DR 994
diff --git a/gcc/testsuite/g++.dg/dfp/base.C b/gcc/testsuite/g++.dg/dfp/base.C
new file mode 100644
index 000000000000..3e5dc50bafe3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/dfp/base.C
@@ -0,0 +1,23 @@
+// PR c++/50207
+// { dg-do compile }
+
+namespace std
+{
+  namespace decimal
+  {
+    template <class _Fmt> struct _FmtTraits;
+    class decimal32;
+    template <> struct _FmtTraits <decimal32>
+    {
+      static const long _NumBytes = 4UL;
+    };
+    template <class _Tr> class _DecBase
+    {
+      unsigned char _Bytes[_Tr::_NumBytes];
+    };
+    class decimal32 : public _DecBase <_FmtTraits <decimal32> >	// { dg-error "has base" }
+    {
+      decimal32 () { }
+    };
+  }
+}