procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++: ICE with computed gotos [PR115469]

Browse source 
This is a low-prio crash on invalid code where we ICE on a VAR_DECL
with erroneous type.  I thought I'd try to avoid putting such decls
into ->names and ->names_in_scope but that sounds riskier than the
following cleanup.

	PR c++/115469

gcc/cp/ChangeLog:

	* decl.cc (automatic_var_with_nontrivial_dtor_p): New.
	(poplevel_named_label_1): Use it.
	(check_goto_1): Likewise.

gcc/testsuite/ChangeLog:

	* g++.dg/ext/label17.C: New test.
This commit is contained in:
Marek Polacek 2024-06-26 17:55:21 -04:00
parent cb39f7df8d
commit c90e785bb6
2 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gcc/cp/decl.cc
View file

@ -514,6 +514,20 @@ level_for_consteval_if (cp_binding_level *b)
&& IF_STMT_CONSTEVAL_P (b->this_entity));
}
/* True if T is a non-static VAR_DECL that has a non-trivial destructor.
See [stmt.dcl]/2. */
static bool
automatic_var_with_nontrivial_dtor_p (const_tree t)
{
if (error_operand_p (t))
return false;
return (VAR_P (t)
&& decl_storage_duration (CONST_CAST_TREE (t)) == dk_auto
&& TYPE_HAS_NONTRIVIAL_DESTRUCTOR (TREE_TYPE (t)));
}
/* Update data for defined and undefined labels when leaving a scope. */
int
@ -575,8 +589,7 @@ poplevel_named_label_1 (named_label_entry **slot, cp_binding_level *bl)
if (bl->kind == sk_catch)
vec_safe_push (cg, get_identifier ("catch"));
for (tree d = use->names_in_scope; d; d = DECL_CHAIN (d))
if (TREE_CODE (d) == VAR_DECL && !TREE_STATIC (d)
&& TYPE_HAS_NONTRIVIAL_DESTRUCTOR (TREE_TYPE (d)))
if (automatic_var_with_nontrivial_dtor_p (d))
vec_safe_push (cg, d);
}
@ -4003,8 +4016,7 @@ check_goto_1 (named_label_entry *ent, bool computed)
tree end = b == level ? names : NULL_TREE;
for (tree d = b->names; d != end; d = DECL_CHAIN (d))
{
if (TREE_CODE (d) == VAR_DECL && !TREE_STATIC (d)
&& TYPE_HAS_NONTRIVIAL_DESTRUCTOR (TREE_TYPE (d)))
if (automatic_var_with_nontrivial_dtor_p (d))
{
if (!identified)
{

18
gcc/testsuite/g++.dg/ext/label17.C Normal file
View file

@ -0,0 +1,18 @@
// PR c++/115469
// { dg-do compile { target indirect_jumps } }
// { dg-options "" }
void
fn1 ()
{
b = &&c; // { dg-error "not declared|not defined" }
goto *0;
}
void
fn2 ()
{
c:
b = &&c; // { dg-error "not declared" }
goto *0;
}