From patchwork Mon Sep 20 04:14:21 2021 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: 45170 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D9FE53858434 for ; Mon, 20 Sep 2021 04:14:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D9FE53858434 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1632111296; bh=KmcfCS22UNVJA04wzMnUXOeYXUsBIfgjDNhYg1r1tRs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=LR1iOhrfQpoBE3oCUhi2iH19S82Y6gmVzc4YB+hLd7dhKxhp0xmIQrIbUkhWaP3vE iHsV9ObmtNC6PUeGtFq0sshN+Qomg7FEjLldcpOuRYcgsjUgaI4Adj+/qLxJbu5xCv XaCTixl0FGz9zU34m7apBSchXBMfIdWCaDaLUhwc= 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 69C2E3858D3C for ; Mon, 20 Sep 2021 04:14:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 69C2E3858D3C Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18JLifoo021959 for ; Sun, 19 Sep 2021 21:14:27 -0700 Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com with ESMTP id 3b6ascgv1n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Sun, 19 Sep 2021 21:14:26 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 19 Sep 2021 21:14:24 -0700 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; Sun, 19 Sep 2021 21:14:24 -0700 Received: from linux.wrightpinski.org.com (unknown [10.69.242.197]) by maili.marvell.com (Postfix) with ESMTP id C07693F706C; Sun, 19 Sep 2021 21:14:24 -0700 (PDT) To: Subject: [PATCH] c: [PR32122] Require pointer types for computed gotos Date: Sun, 19 Sep 2021 21:14:21 -0700 Message-ID: <1632111261-18790-1-git-send-email-apinski@marvell.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Proofpoint-GUID: qe9Lh9jIl7fP9CUUYLCdZD5X9-uVIqAt X-Proofpoint-ORIG-GUID: qe9Lh9jIl7fP9CUUYLCdZD5X9-uVIqAt X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475 definitions=2021-09-20_01,2021-09-17_02,2020-04-07_01 X-Spam-Status: No, score=-14.9 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_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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 Cc: Andrew Pinski Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" From: Andrew Pinski So GCC has always accepted non-pointer types in computed gotos but that was wrong based on the documentation: Any expression of type void * is allowed. So this fixes the problem by requiring the type to be a pointer type. OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions. PR c/32122 gcc/c/ChangeLog: * c-parser.c (c_parser_statement_after_labels): Pass the c_expr instead of the tree to c_finish_goto_ptr. * c-typeck.c (c_finish_goto_ptr): Change the second argument type to c_expr. * c-tree.h (c_finish_goto_ptr): Likewise. Error out if the expression was not of a pointer type. gcc/testsuite/ChangeLog: * gcc.dg/comp-goto-5.c: New test. * gcc.dg/comp-goto-6.c: New test. --- gcc/c/c-parser.c | 2 +- gcc/c/c-tree.h | 2 +- gcc/c/c-typeck.c | 11 ++++++++++- gcc/testsuite/gcc.dg/comp-goto-5.c | 11 +++++++++++ gcc/testsuite/gcc.dg/comp-goto-6.c | 6 ++++++ 5 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/comp-goto-5.c create mode 100644 gcc/testsuite/gcc.dg/comp-goto-6.c diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index fb1399e300d..bcd8a05489f 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -6141,7 +6141,7 @@ c_parser_statement_after_labels (c_parser *parser, bool *if_p, c_parser_consume_token (parser); val = c_parser_expression (parser); val = convert_lvalue_to_rvalue (loc, val, false, true); - stmt = c_finish_goto_ptr (loc, val.value); + stmt = c_finish_goto_ptr (loc, val); } else c_parser_error (parser, "expected identifier or %<*%>"); diff --git a/gcc/c/c-tree.h b/gcc/c/c-tree.h index d50d0cb7f2d..a046c6b0926 100644 --- a/gcc/c/c-tree.h +++ b/gcc/c/c-tree.h @@ -746,7 +746,7 @@ extern tree c_finish_expr_stmt (location_t, tree); extern tree c_finish_return (location_t, tree, tree); extern tree c_finish_bc_stmt (location_t, tree, bool); extern tree c_finish_goto_label (location_t, tree); -extern tree c_finish_goto_ptr (location_t, tree); +extern tree c_finish_goto_ptr (location_t, c_expr val); extern tree c_expr_to_decl (tree, bool *, bool *); extern tree c_finish_omp_construct (location_t, enum tree_code, tree, tree); extern tree c_finish_oacc_data (location_t, tree, tree); diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 49d1bb067a0..b472e448011 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -10783,10 +10783,19 @@ c_finish_goto_label (location_t loc, tree label) the GOTO. */ tree -c_finish_goto_ptr (location_t loc, tree expr) +c_finish_goto_ptr (location_t loc, c_expr val) { + tree expr = val.value; tree t; pedwarn (loc, OPT_Wpedantic, "ISO C forbids %"); + if (expr != error_mark_node + && !POINTER_TYPE_P (TREE_TYPE (expr)) + && !null_pointer_constant_p (expr)) + { + error_at (val.get_location (), + "computed goto must be pointer type"); + expr = build_zero_cst (ptr_type_node); + } expr = c_fully_fold (expr, false, NULL); expr = convert (ptr_type_node, expr); t = build1 (GOTO_EXPR, void_type_node, expr); diff --git a/gcc/testsuite/gcc.dg/comp-goto-5.c b/gcc/testsuite/gcc.dg/comp-goto-5.c new file mode 100644 index 00000000000..d487729a5d4 --- /dev/null +++ b/gcc/testsuite/gcc.dg/comp-goto-5.c @@ -0,0 +1,11 @@ +/* PR c/32122 */ +/* { dg-do compile } */ +/* { dg-options "" } */ + +enum {a=1}; +void foo() +{ + goto * + a; /* { dg-error "computed goto must be pointer type" } */ +} + diff --git a/gcc/testsuite/gcc.dg/comp-goto-6.c b/gcc/testsuite/gcc.dg/comp-goto-6.c new file mode 100644 index 00000000000..497f6cd76ca --- /dev/null +++ b/gcc/testsuite/gcc.dg/comp-goto-6.c @@ -0,0 +1,6 @@ +/* PR c/32122 */ +/* { dg-do compile } */ +/* { dg-options "" } */ +void foo(void *a) { goto *10000000; } /* { dg-error "computed goto must be pointer type" } */ +void foo1(void *a) { goto *a; } +