OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR c++/81164 - ICE with invalid inherited constructor.

Browse Source 
* search.c (binfo_direct_p): New.
	* name-lookup.c (do_class_using_decl): Use it.

From-SVN: r249797
This commit is contained in:
Jason Merrill 2017-06-29 11:30:11 -04:00 committed by Jason Merrill
parent 8ff22ea5a8
commit 84eb0f1a3b
5 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2017-06-29 Jason Merrill <jason@redhat.com>
PR c++/81164 - ICE with invalid inherited constructor.
* search.c (binfo_direct_p): New.
* name-lookup.c (do_class_using_decl): Use it.
2017-06-29 Nathan Sidwell <nathan@acm.org>
* cp-tree.h (THIS_NAME, IN_CHARGE_NAME, VTBL_PTR_TYPE,

1
gcc/cp/cp-tree.h
View File

@ -6598,6 +6598,7 @@ extern tree dfs_walk_all (tree, tree (*) (tree, void *),
extern tree dfs_walk_once (tree, tree (*) (tree, void *),
tree (*) (tree, void *), void *);
extern tree binfo_via_virtual (tree, tree);
extern bool binfo_direct_p (tree);
extern tree build_baselink (tree, tree, tree, tree);
extern tree adjust_result_of_qualified_name_lookup
(tree, tree, tree);

3
gcc/cp/name-lookup.c
View File

@ -4167,8 +4167,7 @@ do_class_using_decl (tree scope, tree name)
return NULL_TREE;
}
}
else if (name == ctor_identifier
&& BINFO_INHERITANCE_CHAIN (BINFO_INHERITANCE_CHAIN (binfo)))
else if (name == ctor_identifier && !binfo_direct_p (binfo))
{
error ("cannot inherit constructors from indirect base %qT", scope);
return NULL_TREE;

22
gcc/cp/search.c
View File

@ -2976,6 +2976,28 @@ binfo_via_virtual (tree binfo, tree limit)
return NULL_TREE;
}
/* BINFO is for a base class in some hierarchy. Return true iff it is a
direct base. */
bool
binfo_direct_p (tree binfo)
{
tree d_binfo = BINFO_INHERITANCE_CHAIN (binfo);
if (BINFO_INHERITANCE_CHAIN (d_binfo))
/* A second inheritance chain means indirect. */
return false;
if (!BINFO_VIRTUAL_P (binfo))
/* Non-virtual, so only one inheritance chain means direct. */
return true;
/* A virtual base looks like a direct base, so we need to look through the
direct bases to see if it's there. */
tree b_binfo;
for (int i = 0; BINFO_BASE_ITERATE (d_binfo, i, b_binfo); ++i)
if (b_binfo == binfo)
return true;
return false;
}
/* BINFO is a base binfo in the complete type BINFO_TYPE (HERE).
Find the equivalent binfo within whatever graph HERE is located.
This is the inverse of original_binfo. */

7
gcc/testsuite/g++.dg/cpp0x/inh-ctor28.C Normal file
View File

@ -0,0 +1,7 @@
// PR c++/81164
// { dg-do compile { target c++11 } }
struct A {};
struct B : virtual A {};
struct C : virtual A {};
struct D : B,C { using A::A; }; // { dg-error "indirect" }