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

Fix PRs 106764, 106765, and 107307, all ICE after invalid re-declaration

Browse Source 
The problem here is the gimplifier returns GS_ERROR but
in some cases we don't check that soon enough and try
to do other work which could crash.
So the fix in these two cases is to return GS_ERROR
early if the gimplify_* functions had return GS_ERROR.

OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions.

Thanks,
Andrew Pinski

gcc/ChangeLog:

	PR c/106764
	PR c/106765
	PR c/107307
	* gimplify.cc (gimplify_compound_lval): Return GS_ERROR
	if gimplify_expr had return GS_ERROR.
	(gimplify_call_expr): Likewise.

gcc/testsuite/ChangeLog:

	PR c/106764
	PR c/106765
	PR c/107307
	* gcc.dg/redecl-19.c: New test.
	* gcc.dg/redecl-20.c: New test.
	* gcc.dg/redecl-21.c: New test.
This commit is contained in:
Andrew Pinski 2022-11-17 22:08:07 +00:00
parent acc205eff4
commit bd0c9d9e70
4 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/gimplify.cc
View File

@ -3272,6 +3272,8 @@ gimplify_compound_lval (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p,
tret = gimplify_expr (p, pre_p, post_p, is_gimple_min_lval,
fallback | fb_lvalue);
ret = MIN (ret, tret);
if (ret == GS_ERROR)
return GS_ERROR;
/* Step 2a: if we have component references we do not support on
registers then make sure the base isn't a register. Of course
@ -3709,6 +3711,9 @@ gimplify_call_expr (tree *expr_p, gimple_seq *pre_p, bool want_value)
ret = gimplify_expr (&CALL_EXPR_FN (*expr_p), pre_p, NULL,
is_gimple_call_addr, fb_rvalue);
if (ret == GS_ERROR)
return GS_ERROR;
nargs = call_expr_nargs (*expr_p);
/* Get argument types for verification. */

5
gcc/testsuite/gcc.dg/redecl-19.c Normal file
View File

@ -0,0 +1,5 @@
/* We used to ICE in the gimplifier, PR 106764 */
/* { dg-do compile } */
/* { dg-options "-w" } */
(*a)(); // { dg-note "" }
b(){a()} a; // { dg-error "" }

9
gcc/testsuite/gcc.dg/redecl-20.c Normal file
View File

@ -0,0 +1,9 @@
/* We used to ICE in the gimplifier, PR 107307 */
// { dg-do compile }
// { dg-options "-w" }
void f ()
{
const struct { int a[1]; } b; // { dg-note "" }
int *c = b.a;
int *b; // { dg-error "" }
}

9
gcc/testsuite/gcc.dg/redecl-21.c Normal file
View File

@ -0,0 +1,9 @@
/* We used to ICE in the gimplifier, PR 106765 */
/* { dg-do compile } */
/* { dg-options "-w" } */
struct a {
int b
} c() {
struct a a; // { dg-note "" }
a.b;
d a; // { dg-error "" }