search.c (get_matching_virtual): Notice virtual bases when sorrying about covariant returns.

* search.c (get_matching_virtual): Notice virtual bases when sorrying about covariant returns. From-SVN: r15732

search.c (get_matching_virtual): Notice virtual bases when sorrying about covariant returns.
* search.c (get_matching_virtual): Notice virtual bases when sorrying about covariant returns. From-SVN: r15732
1052cd65 · Jason Merrill · Jason Merrill · c2b9a5c4 · 1052cd65 · 1052cd65
Commit 1052cd65 authored Sep 26, 1997 by Jason Merrill Committed by Jason Merrill Sep 26, 1997
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletions

gcc/cp/ChangeLog
+3 -0

gcc/cp/search.c
+2 -1

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
 Fri Sep 26 00:22:56 1997  Jason Merrill  <jason@yorick.cygnus.com>

+	* search.c (get_matching_virtual): Notice virtual bases when sorrying
+	about covariant returns.
+
 	* parse.y (member_init): Also imply typename here.  Remove ancient
 	extension for initializing base members.


--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -2197,7 +2197,8 @@ get_matching_virtual (binfo, fndecl, dtorp)
 			{
 			  tree binfo = get_binfo (b, d, 1);
 			  if (binfo != error_mark_node
-			      && ! BINFO_OFFSET_ZEROP (binfo))
+			      && (! BINFO_OFFSET_ZEROP (binfo)
+				  || TREE_VIA_VIRTUAL (binfo)))
 			    sorry ("adjusting pointers for covariant returns");
 			}
 		      if (TYPE_READONLY (d) > TYPE_READONLY (b))