From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by sourceware.org (Postfix) with ESMTPS id B8C483853D68 for ; Fri, 18 Nov 2022 03:25:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B8C483853D68 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=marvell.com Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2AI1x39t004813 for ; Thu, 17 Nov 2022 19:25:22 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=pfpt0220; bh=Wz9SqNqwNM7b5Qqd5df82GiP7w6Mcm4/I0YfEx4s6+E=; b=JV66xJszrFJsmIKHmpYnOJDoJd0wxHd45krn/mnwFXiuu5K6tNN/pPl95DtvCJ8rEbOT 1ilWHA1OasN25j94GhbkVuXXDZMfJETQ6dcfQS53NzGtjhOVag8TeK1v+Y3/ViKFHlCn fTmJCNhFnSNhVoimtKJksPxxjmIxEWk+OpUcZP0CoQKknkKIT399LRTfUPVzs2e3B4aB soB1KN4W2ihvFK3/Bx8FeCxaB53GSPbUiKpPQHU5+qGV1uHKs+GigtKhhtNMf3ynasrc lTmQzyUP2OhF44PUKt+QtqLYDQ2bunf9ANzwWNzYiR750iNbnox5j/DEgI/ls2i7qEAh jQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3kx0ut8ayj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 17 Nov 2022 19:25:22 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 17 Nov 2022 19:25:20 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Thu, 17 Nov 2022 19:25:20 -0800 Received: from linux.wrightpinski.org.com (unknown [10.69.242.198]) by maili.marvell.com (Postfix) with ESMTP id A21F63F7083; Thu, 17 Nov 2022 19:25:17 -0800 (PST) From: To: CC: Andrew Pinski Subject: [PATCH 1/2] Fix PRs 106764, 106765, and 107307, all ICE after invalid re-declaration Date: Thu, 17 Nov 2022 19:25:10 -0800 Message-ID: <1668741911-1727-1-git-send-email-apinski@marvell.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-GUID: FQ-pnyx15rAN6Jd_JNZG1oVDhdFKl5Nr X-Proofpoint-ORIG-GUID: FQ-pnyx15rAN6Jd_JNZG1oVDhdFKl5Nr X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-17_06,2022-11-17_01,2022-06-22_01 X-Spam-Status: No, score=-14.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Andrew Pinski 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. --- gcc/gimplify.cc | 5 +++++ gcc/testsuite/gcc.dg/redecl-19.c | 5 +++++ gcc/testsuite/gcc.dg/redecl-20.c | 9 +++++++++ gcc/testsuite/gcc.dg/redecl-21.c | 9 +++++++++ 4 files changed, 28 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/redecl-19.c create mode 100644 gcc/testsuite/gcc.dg/redecl-20.c create mode 100644 gcc/testsuite/gcc.dg/redecl-21.c diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc index f06ce3cc77a..c62a966e918 100644 --- a/gcc/gimplify.cc +++ b/gcc/gimplify.cc @@ -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. */ diff --git a/gcc/testsuite/gcc.dg/redecl-19.c b/gcc/testsuite/gcc.dg/redecl-19.c new file mode 100644 index 00000000000..cc10685448b --- /dev/null +++ b/gcc/testsuite/gcc.dg/redecl-19.c @@ -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 "" } diff --git a/gcc/testsuite/gcc.dg/redecl-20.c b/gcc/testsuite/gcc.dg/redecl-20.c new file mode 100644 index 00000000000..07f52115ec8 --- /dev/null +++ b/gcc/testsuite/gcc.dg/redecl-20.c @@ -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 "" } +} diff --git a/gcc/testsuite/gcc.dg/redecl-21.c b/gcc/testsuite/gcc.dg/redecl-21.c new file mode 100644 index 00000000000..2f2a6548a57 --- /dev/null +++ b/gcc/testsuite/gcc.dg/redecl-21.c @@ -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 "" } -- 2.17.1