From aa827ee9cff3d9b3dd3f4de76d875d6f11345190 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 29 Mar 2012 15:55:01 +0000
Subject: [PATCH] 	PR c++/52685 	* tree.c (copy_binfo): Handle
 BINFO_DEPENDENT_BASE_P.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185968 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                         |  5 +++++
 gcc/cp/tree.c                            |  5 +----
 gcc/testsuite/ChangeLog                  |  5 +++++
 gcc/testsuite/g++.dg/template/inherit8.C | 13 +++++++++++++
 4 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/template/inherit8.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4f9bae8..af7fa2d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-29  Jason Merrill  <jason@redhat.com>
+
+	PR c++/52685
+	* tree.c (copy_binfo): Handle BINFO_DEPENDENT_BASE_P.
+
 2012-03-29  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/52759
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 87e9be8..30ad5e1 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1237,12 +1237,11 @@ copy_binfo (tree binfo, tree type, tree t, tree *igo_prev, int virt)
   TREE_CHAIN (*igo_prev) = new_binfo;
   *igo_prev = new_binfo;
 
-  if (binfo)
+  if (binfo && !BINFO_DEPENDENT_BASE_P (binfo))
     {
       int ix;
       tree base_binfo;
 
-      gcc_assert (!BINFO_DEPENDENT_BASE_P (binfo));
       gcc_assert (SAME_BINFO_TYPE_P (BINFO_TYPE (binfo), type));
 
       BINFO_OFFSET (new_binfo) = BINFO_OFFSET (binfo);
@@ -1255,8 +1254,6 @@ copy_binfo (tree binfo, tree type, tree t, tree *igo_prev, int virt)
       for (ix = 0; BINFO_BASE_ITERATE (binfo, ix, base_binfo); ix++)
 	{
 	  tree new_base_binfo;
-
-	  gcc_assert (!BINFO_DEPENDENT_BASE_P (base_binfo));
 	  new_base_binfo = copy_binfo (base_binfo, BINFO_TYPE (base_binfo),
 				       t, igo_prev,
 				       BINFO_VIRTUAL_P (base_binfo));
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 00ec7bb..d25b4d9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-29  Jason Merrill  <jason@redhat.com>
+
+	PR c++/52685
+	* g++.dg/template/inherit8.C: New.
+
 2012-03-29  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/52759
diff --git a/gcc/testsuite/g++.dg/template/inherit8.C b/gcc/testsuite/g++.dg/template/inherit8.C
new file mode 100644
index 0000000..a9b2bdb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/inherit8.C
@@ -0,0 +1,13 @@
+// PR c++/52685
+
+template <typename T>
+struct A
+{
+  template <typename U>
+  struct B : public A <B<U> >
+  {
+    struct C : public B<U>
+    {
+    };
+  };
+};
-- 
2.7.4