From patchwork Fri Nov 18 03:25:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 22084 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp754943wrr; Thu, 17 Nov 2022 19:26:15 -0800 (PST) X-Google-Smtp-Source: AA0mqf4KextPZyVhk3AQri6Whau6VNxvLoLI94JHZAJqdcPCuGZySoeg9Ibz4fwwlzouibeCNiM6 X-Received: by 2002:a17:906:130b:b0:7ad:92c5:637a with SMTP id w11-20020a170906130b00b007ad92c5637amr4439278ejb.87.1668741975643; Thu, 17 Nov 2022 19:26:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668741975; cv=none; d=google.com; s=arc-20160816; b=BkbVHe5mTNVp+N4nlSglzD+ERigIMdIjzUZvomihdW4e1vbzbxgKPQVIXOCEC2GMOH m818LwzzTsjxRR+0Ohp9DUYmWgvbw13pz0v8wbCcL9EqngFfhfap9Q9oyY+21mwjZ8RB CQ6HUdZ6DRhIlPTa88NG7mCUxO4HDiGlPQarZBbtZlxOz4FTP/pn6lsomjCLOwpXTmO+ d54RPcPfHc4X0UYo+ypdEraTX8pLq0VMwTQjz3dQ7WAnyH+ySV7aCEqZbT9AAhIu5sE7 yjavGtRmNBO6ZWd0hgQ3Nc5PlRCkxQWQnRUKtF9BDM+9nidAxalrwQlc0llk8QuOPAu+ 15Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:mime-version :references:in-reply-to:message-id:date:subject:cc:to:dmarc-filter :delivered-to:dkim-signature:dkim-filter; bh=Dx3dxL1zMj0YOJdWCudEtQGTN3hAEvb9cXhIGVC7VVo=; b=QkbCA626RrQoM35j0JSf8Mrbxve8zG8u/MYvvx+aYb4Smx+m+/aRfDipjSBH7GaG1V dXO+vRhsPqtgaWi//GH+ReP5O4Nib7iDDIhvDS7nWyUyAxoerN+eWfts0uXQW55Ed44P r67A+nFdG4EcmyMbv6vkKDnoWgzXDiq9Gcii+YYNbbds25zyI90M+YJGhGv4VwzGFhSZ ScKuHUoHZOPmBmGHWQWtiOkis5TZ71x34P+vu8OcKbSPRI4sDBf1E0gTXtYZQWfywPUk iKtnEjY1fQlHjcz58Lc4JUjzCXvJp1mOTbaoAH6IgtZBAzpD/PQBWftLjSPSG4O3u4PK 3Rdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="d/a85a4N"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id qw16-20020a1709066a1000b0078232bfe3a0si2350523ejc.331.2022.11.17.19.26.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 19:26:15 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="d/a85a4N"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 08FFA384F497 for ; Fri, 18 Nov 2022 03:26:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08FFA384F497 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668741969; bh=Dx3dxL1zMj0YOJdWCudEtQGTN3hAEvb9cXhIGVC7VVo=; h=To:CC:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=d/a85a4N01FYtgIUdDJdR41yk+lWeH4v4iYrwWLHBS2ED6L6fZabiC8VGSh+A/PhZ KVobF3/RCcJ/Qu6PPo9FcnhveRQ8W2HMZQ0CQ8W6/bkOxLyqb09H7VdE4M9UtjTJpI a3qmDdxdVNVgNlNjZg05qLCufNt81IQS+xZGjzNs= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by sourceware.org (Postfix) with ESMTPS id B8995385841C for ; Fri, 18 Nov 2022 03:25:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B8995385841C 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 2AI1wNd3003432 for ; Thu, 17 Nov 2022 19:25:22 -0800 Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3kx0ut8ayk-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-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 17 Nov 2022 19:25:20 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 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 139C43F704E; Thu, 17 Nov 2022 19:25:18 -0800 (PST) To: CC: Andrew Pinski Subject: [PATCH 2/2] Fix PR middle-end/107705: ICE after reclaration error Date: Thu, 17 Nov 2022 19:25:11 -0800 Message-ID: <1668741911-1727-2-git-send-email-apinski@marvell.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1668741911-1727-1-git-send-email-apinski@marvell.com> References: <1668741911-1727-1-git-send-email-apinski@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: K4iVMwmIjg7TUgzK6bbhVzcwQGUIjhHQ X-Proofpoint-ORIG-GUID: K4iVMwmIjg7TUgzK6bbhVzcwQGUIjhHQ 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: apinski--- via Gcc-patches From: "Li, Pan2 via Gcc-patches" Reply-To: apinski@marvell.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749802786086832386?= X-GMAIL-MSGID: =?utf-8?q?1749802786086832386?= From: Andrew Pinski The problem here is after we created a call expression in the C front-end, we replace the decl type with an error mark node. We then end up calling aggregate_value_p with the call expression with the decl with the error mark as the type and we ICE. The fix is to check the function type after we process the call expression inside aggregate_value_p to get it. OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions. Thanks, Andrew Pinski gcc/ChangeLog: PR middle-end/107705 * function.cc (aggregate_value_p): Return 0 if the function type was an error operand. gcc/testsuite/ChangeLog: * gcc.dg/redecl-22.c: New test. --- gcc/function.cc | 3 +++ gcc/testsuite/gcc.dg/redecl-22.c | 9 +++++++++ 2 files changed, 12 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/redecl-22.c diff --git a/gcc/function.cc b/gcc/function.cc index 361aa5f7ed1..9c8773bbc59 100644 --- a/gcc/function.cc +++ b/gcc/function.cc @@ -2090,6 +2090,9 @@ aggregate_value_p (const_tree exp, const_tree fntype) if (VOID_TYPE_P (type)) return 0; + if (error_operand_p (fntype)) + return 0; + /* If a record should be passed the same as its first (and only) member don't pass it as an aggregate. */ if (TREE_CODE (type) == RECORD_TYPE && TYPE_TRANSPARENT_AGGR (type)) diff --git a/gcc/testsuite/gcc.dg/redecl-22.c b/gcc/testsuite/gcc.dg/redecl-22.c new file mode 100644 index 00000000000..7758570fabe --- /dev/null +++ b/gcc/testsuite/gcc.dg/redecl-22.c @@ -0,0 +1,9 @@ +/* We used to ICE in the gimplifier, PR 107705 */ +/* { dg-do compile } */ +/* { dg-options "-w" } */ +int f (void) +{ + int (*p) (void) = 0; // { dg-note "" } + return p (); + int p = 1; // { dg-error "" } +}