From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 23 Nov 2005 13:53:15 +0000 (+0100)
Subject: re PR c++/21983 (multiple diagnostics)
X-Git-Tag: releases/gcc-3.4.5~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e06e295a0bccbfb5ef9d20f56fc6c0881d525ef1;p=thirdparty%2Fgcc.git

re PR c++/21983 (multiple diagnostics)

	PR c++/21983
	* class.c (find_final_overrider): Move diagnostic about no unique final
	overrider to...
	(update_vtable_entry_for_fn): ... here.

	* g++.dg/warn/pr21983.C: New test.

From-SVN: r107420
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 95b6845ce390..ac46b8e9c4ad 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-23  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/21983
+	* class.c (find_final_overrider): Move diagnostic about no unique final
+	overrider to...
+	(update_vtable_entry_for_fn): ... here.
+
 2005-11-15  Jason Merrill  <jason@redhat.com>
 
 	PR c++/24580
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 09daf118a80f..5a0d076a515c 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -2035,11 +2035,7 @@ find_final_overrider (tree derived, tree binfo, tree fn)
 
   /* If there was no winner, issue an error message.  */
   if (!ffod.candidates || TREE_CHAIN (ffod.candidates))
-    {
-      error ("no unique final overrider for `%D' in `%T'", fn, 
-	     BINFO_TYPE (derived));
-      return error_mark_node;
-    }
+    return error_mark_node;
 
   return ffod.candidates;
 }
@@ -2099,7 +2095,10 @@ update_vtable_entry_for_fn (tree t, tree binfo, tree fn, tree* virtuals,
   /* Find the final overrider.  */
   overrider = find_final_overrider (TYPE_BINFO (t), b, target_fn);
   if (overrider == error_mark_node)
-    return;
+    {
+      error ("no unique final overrider for `%D' in `%T'", target_fn, t);
+      return;
+    }
   overrider_target = overrider_fn = TREE_PURPOSE (overrider);
   
   /* Check for adjusting covariant return types.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 24095bc63f1f..2def9c517a78 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-23  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/21983
+	* g++.dg/warn/pr21983.C: New test.
+
 2005-11-23  Alan Modra  <amodra@bigpond.net.au>
 
 	PR middle-end/24950
diff --git a/gcc/testsuite/g++.dg/warn/pr21983.C b/gcc/testsuite/g++.dg/warn/pr21983.C
new file mode 100644
index 000000000000..3021c3ff5003
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/pr21983.C
@@ -0,0 +1,7 @@
+// PR c++/21983
+// { dg-do compile }
+
+struct B { virtual void foo () = 0; };
+struct D1 : public virtual B { virtual void foo () {} };
+struct D2 : public virtual B { virtual void foo () {} };
+struct D : public D1, public D2 { };	// { dg-warning "no unique final overrider" }