From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 3 Feb 2014 18:22:46 +0000 (+0000)
Subject: /cp
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d86e71c1ed4560b20eb072908dab671e7daa467f;p=thirdparty%2Fgcc.git

/cp
2014-02-03  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/58871
	* method.c (synthesized_method_walk): If vbases is non-null but
	is_empty is true, likewise don't worry about the virtual bases.

/testsuite
2014-02-03  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/58871
	* g++.dg/cpp0x/pr58871.C: New.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@207434 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2e09c8849745..e73246a4a66a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-03  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/58871
+	* method.c (synthesized_method_walk): If vbases is non-null but
+	is_empty is true, likewise don't worry about the virtual bases.
+
 2014-02-01  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/51219
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index a1a10514ae9e..b1fa943ce6c9 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -1366,7 +1366,7 @@ synthesized_method_walk (tree ctype, special_function_kind sfk, bool const_p,
     }
 
   vbases = CLASSTYPE_VBASECLASSES (ctype);
-  if (vbases == NULL)
+  if (vec_safe_is_empty (vbases))
     /* No virtual bases to worry about.  */;
   else if (!assign_p)
     {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d896017e5d45..8c7af4969544 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-03  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/58871
+	* g++.dg/cpp0x/pr58871.C: New.
+
 2014-02-03  Cong Hou  <congh@google.com>
 
 	PR tree-optimization/60000
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr58871.C b/gcc/testsuite/g++.dg/cpp0x/pr58871.C
new file mode 100644
index 000000000000..5920f5c3a0d9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr58871.C
@@ -0,0 +1,12 @@
+// PR c++/59111
+// { dg-do compile { target c++11 } }
+
+template<typename T> struct A : virtual T  // { dg-error "base type" }
+{
+  A();
+  A(const A&);
+};
+
+template<typename T> A<T>::A(const A<T>&) = default;
+
+A<int> a = A<int>();