mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-18 20:11:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/70202 (ICE on invalid code on x86_64-linux-gnu in build_simple_base_path, at cp/class.c:579)

Browse Source 
/cp
2016-06-15  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/70202
	* decl.c (xref_basetypes): Revert r117839 changes; add fix-up
	code at the end of the for loop; also revert r159637 changes,
	add back the gcc_assert.
	* cp-tree.h (xref_basetypes): Adjust declaration.
	* parser.c (cp_parser_class_head): Adjust xref_basetypes call.

/testsuite
2016-06-15  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/70202
	* g++.dg/inherit/crash6.C: New.
	* g++.dg/inherit/union2.C: Likewise.
	* g++.dg/inherit/virtual12.C: Likewise.
	* g++.dg/inherit/virtual13.C: Likewise.
	* g++.dg/inherit/virtual1.C: Tweak dg-* tests.

From-SVN: r237482
This commit is contained in:
Paolo Carlini 2016-06-15 15:23:40 +00:00 committed by Paolo Carlini
parent 75dc52c674
commit b8911cb870
10 changed files with 94 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/cp/ChangeLog
View File

@ -1,3 +1,12 @@
2016-06-15 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/70202
* decl.c (xref_basetypes): Revert r117839 changes; add fix-up
code at the end of the for loop; also revert r159637 changes,
add back the gcc_assert.
* cp-tree.h (xref_basetypes): Adjust declaration.
* parser.c (cp_parser_class_head): Adjust xref_basetypes call.
2016-06-14 David Malcolm <dmalcolm@redhat.com>
* search.c: Include spellcheck-tree.h rather than spellcheck.h.

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

@ -5788,7 +5788,7 @@ extern int grok_ctor_properties (const_tree, const_tree);
extern bool grok_op_properties (tree, bool);
extern tree xref_tag (enum tag_types, tree, tag_scope, bool);
extern tree xref_tag_from_type (tree, tree, tag_scope);
extern bool xref_basetypes (tree, tree);
extern void xref_basetypes (tree, tree);
extern tree start_enum (tree, tree, tree, tree, bool, bool *);
extern void finish_enum_value_list (tree);
extern void finish_enum (tree);

53
gcc/cp/decl.c
View File

@ -12879,12 +12879,9 @@ xref_tag_from_type (tree old, tree id, tag_scope scope)
/* Create the binfo hierarchy for REF with (possibly NULL) base list
BASE_LIST. For each element on BASE_LIST the TREE_PURPOSE is an
access_* node, and the TREE_VALUE is the type of the base-class.
Non-NULL TREE_TYPE indicates virtual inheritance.
Returns true if the binfo hierarchy was successfully created,
false if an error was detected. */
Non-NULL TREE_TYPE indicates virtual inheritance. */
bool
void
xref_basetypes (tree ref, tree base_list)
{
tree *basep;
@ -12897,7 +12894,7 @@ xref_basetypes (tree ref, tree base_list)
tree igo_prev; /* Track Inheritance Graph Order. */
if (ref == error_mark_node)
return false;
return;
/* The base of a derived class is private by default, all others are
public. */
@ -12941,11 +12938,7 @@ xref_basetypes (tree ref, tree base_list)
/* The binfo slot should be empty, unless this is an (ill-formed)
redefinition. */
if (TYPE_BINFO (ref) && !TYPE_SIZE (ref))
{
error ("redefinition of %q#T", ref);
return false;
}
gcc_assert (!TYPE_BINFO (ref) || TYPE_SIZE (ref));
gcc_assert (TYPE_MAIN_VARIANT (ref) == ref);
@ -12965,19 +12958,13 @@ xref_basetypes (tree ref, tree base_list)
CLASSTYPE_NON_AGGREGATE (ref) = 1;
if (TREE_CODE (ref) == UNION_TYPE)
{
error ("derived union %qT invalid", ref);
return false;
}
error ("derived union %qT invalid", ref);
}
if (max_bases > 1)
{
if (TYPE_FOR_JAVA (ref))
{
error ("Java class %qT cannot have multiple bases", ref);
return false;
}
error ("Java class %qT cannot have multiple bases", ref);
else
warning (OPT_Wmultiple_inheritance,
"%qT defined with multiple direct bases", ref);
@ -12988,10 +12975,7 @@ xref_basetypes (tree ref, tree base_list)
vec_alloc (CLASSTYPE_VBASECLASSES (ref), max_vbases);
if (TYPE_FOR_JAVA (ref))
{
error ("Java class %qT cannot have virtual bases", ref);
return false;
}
error ("Java class %qT cannot have virtual bases", ref);
else if (max_dvbases)
warning (OPT_Wvirtual_inheritance,
"%qT defined with direct virtual base", ref);
@ -13014,7 +12998,7 @@ xref_basetypes (tree ref, tree base_list)
{
error ("base type %qT fails to be a struct or class type",
basetype);
return false;
goto dropped_base;
}
if (TYPE_FOR_JAVA (basetype) && (current_lang_depth () == 0))
@ -13048,7 +13032,7 @@ xref_basetypes (tree ref, tree base_list)
error ("recursive type %qT undefined", basetype);
else
error ("duplicate base type %qT invalid", basetype);
return false;
goto dropped_base;
}
if (PACK_EXPANSION_P (TREE_VALUE (base_list)))
@ -13064,8 +13048,25 @@ xref_basetypes (tree ref, tree base_list)
BINFO_BASE_APPEND (binfo, base_binfo);
BINFO_BASE_ACCESS_APPEND (binfo, access);
continue;
dropped_base:
/* Update max_vbases to reflect the reality that we are dropping
this base: if it reaches zero we want to undo the vec_alloc
above to avoid inconsistencies during error-recovery: eg, in
build_special_member_call, CLASSTYPE_VBASECLASSES non null
and vtt null (c++/27952). */
if (via_virtual)
max_vbases--;
if (CLASS_TYPE_P (basetype))
max_vbases
-= vec_safe_length (CLASSTYPE_VBASECLASSES (basetype));
}
if (CLASSTYPE_VBASECLASSES (ref)
&& max_vbases == 0)
vec_free (CLASSTYPE_VBASECLASSES (ref));
if (vec_safe_length (CLASSTYPE_VBASECLASSES (ref)) < max_vbases)
/* If we didn't get max_vbases vbases, we must have shared at
least one of them, and are therefore diamond shaped. */
@ -13096,8 +13097,6 @@ xref_basetypes (tree ref, tree base_list)
else
break;
}
return true;
}

5
gcc/cp/parser.c
View File

@ -22050,9 +22050,8 @@ cp_parser_class_head (cp_parser* parser,
/* If we're really defining a class, process the base classes.
If they're invalid, fail. */
if (type && cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE)
&& !xref_basetypes (type, bases))
type = NULL_TREE;
if (type && cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE))
xref_basetypes (type, bases);
done:
/* Leave the scope given by the nested-name-specifier. We will

9
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,12 @@
2016-06-15 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/70202
* g++.dg/inherit/crash6.C: New.
* g++.dg/inherit/union2.C: Likewise.
* g++.dg/inherit/virtual12.C: Likewise.
* g++.dg/inherit/virtual13.C: Likewise.
* g++.dg/inherit/virtual1.C: Tweak dg-* tests.
2016-06-15 Uros Bizjak <ubizjak@gmail.com>
* gcc.dg/torture/float128-nan.c: Include stdint.h to define uint64_t.

10
gcc/testsuite/g++.dg/inherit/crash6.C Normal file
View File

@ -0,0 +1,10 @@
// PR c++/70202
class A
{
virtual void foo () { }
};
class B : public A, A { }; // { dg-error "duplicate base type" }
B b1, &b2 = b1;
A a = b2;

3
gcc/testsuite/g++.dg/inherit/union2.C Normal file
View File

@ -0,0 +1,3 @@
struct A { };
union U : A { }; // { dg-error "derived union 'U' invalid" }
U u;

8
gcc/testsuite/g++.dg/inherit/virtual1.C
View File

@ -1,12 +1,12 @@
//PR c++/27952
// PR c++/27952
struct A
{
virtual ~A() {}
};
struct B : A, virtual A {}; // { dg-error "duplicate base|forward declaration" }
struct B : A, virtual A {}; // { dg-error "duplicate base" }
struct C : A, B {}; // { dg-error "duplicate base|invalid use" }
struct C : A, B {}; // { dg-message "direct base 'A' inaccessible" }
C c; // { dg-error "aggregate" }
C c;

14
gcc/testsuite/g++.dg/inherit/virtual12.C Normal file
View File

@ -0,0 +1,14 @@
// PR c++/70202
union U { };
struct A
{
virtual ~A() {}
};
struct B : A, virtual U { }; // { dg-error "base type 'U' fails" }
struct C : A, B {}; // { dg-message "direct base 'A' inaccessible" }
C c;

16
gcc/testsuite/g++.dg/inherit/virtual13.C Normal file
View File

@ -0,0 +1,16 @@
// PR c++/70202
struct D { };
union U : virtual D { }; // { dg-error "derived union" }
struct A
{
virtual ~A() {}
};
struct B : A, virtual U { }; // { dg-error "base type 'U' fails" }
struct C : A, B {}; // { dg-message "direct base 'A' inaccessible" }
C c;