From patchwork Tue Oct 5 12:54:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 45884 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 35201385AC24 for ; Tue, 5 Oct 2021 12:56:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 35201385AC24 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1633438612; bh=HMcIFPJJ0SyYTqCJyRfJOEGJEjft9Lyyo4uY51bJU68=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=BPf9eE0ExDRnDdUk4EJJQctFVhTRu6tCFR407dhLLlnXhaa3umuMQg+oep0g2C0ks SHa7RKyAUfStMu/PjrzrVRO3m5IqTzDoYTf69tkUGhSz85tjPk4dj0Xkc63ClnOMNd cIGb4CMMscqDu8xpaVFXpUoCEYXuJq7Hr52CTJEw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id C6A8B385DC15 for ; Tue, 5 Oct 2021 12:54:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C6A8B385DC15 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 9348120022 for ; Tue, 5 Oct 2021 12:54:17 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 8175113C50 for ; Tue, 5 Oct 2021 12:54:17 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Tf18HvlKXGEzeQAAMHmgww (envelope-from ) for ; Tue, 05 Oct 2021 12:54:17 +0000 Date: Tue, 5 Oct 2021 14:54:17 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] Allow more kinds of invariant addresses in GIMPLE FE Message-ID: <62358537-7r12-74ps-1335-1s446q69npo@fhfr.qr> MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The gimple FE is too restrictive in what it accepts as literals, the following makes it also accept &a[10] for example. Bootstrapped on x86_64-unknown-linux-gnu, testing in progress. Richard. 2021-10-05 Richard Biener PR c/102605 gcc/c/ * gimple-parser.c (c_parser_gimple_postfix_expression): Accept more address _Literals. gcc/testsuite/ * gcc.dg/gimplefe-46.c: New testcase. --- gcc/c/gimple-parser.c | 14 +++++++++----- gcc/testsuite/gcc.dg/gimplefe-46.c | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/gimplefe-46.c diff --git a/gcc/c/gimple-parser.c b/gcc/c/gimple-parser.c index c8d9db61f0a..c43ee38a2cf 100644 --- a/gcc/c/gimple-parser.c +++ b/gcc/c/gimple-parser.c @@ -1622,16 +1622,20 @@ c_parser_gimple_postfix_expression (gimple_parser &parser) tree val = c_parser_gimple_postfix_expression (parser).value; if (! val || val == error_mark_node - || (!CONSTANT_CLASS_P (val) - && !(addr_p - && (TREE_CODE (val) == STRING_CST - || DECL_P (val))))) + || (!CONSTANT_CLASS_P (val) && !addr_p)) { c_parser_error (parser, "invalid _Literal"); return expr; } if (addr_p) - val = build1 (ADDR_EXPR, type, val); + { + val = build1 (ADDR_EXPR, type, val); + if (!is_gimple_invariant_address (val)) + { + c_parser_error (parser, "invalid _Literal"); + return expr; + } + } if (neg_p) { val = const_unop (NEGATE_EXPR, TREE_TYPE (val), val); diff --git a/gcc/testsuite/gcc.dg/gimplefe-46.c b/gcc/testsuite/gcc.dg/gimplefe-46.c new file mode 100644 index 00000000000..fb91f7d2a90 --- /dev/null +++ b/gcc/testsuite/gcc.dg/gimplefe-46.c @@ -0,0 +1,23 @@ +/* { dg-do compile } */ +/* { dg-options "-fgimple" } */ + +char global[10]; + +void bar (void); + +void __GIMPLE (ssa) +foo (char * p) +{ + __BB(2): + if (p_2(D) == _Literal (char *)&global[2]) + goto __BB3; + else + goto __BB4; + + __BB(3): + bar (); + goto __BB4; + + __BB(4): + return; +}