From patchwork Tue May 11 10:54:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1477066 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FfZYm6JR0z9srX for ; Tue, 11 May 2021 20:54:35 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C19973886C50; Tue, 11 May 2021 10:54:33 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id EBC563886C42 for ; Tue, 11 May 2021 10:54:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EBC563886C42 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rguenther@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id E605DB0EA for ; Tue, 11 May 2021 10:54:29 +0000 (UTC) Date: Tue, 11 May 2021 12:54:29 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] More maybe_fold_reference TLC Message-ID: MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This adjusts maybe_fold_reference to adhere to its desired behavior of performing constant folding and thus explicitely avoid returning unfolded reference trees. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. 2021-05-11 Richard Biener * gimple-fold.c (maybe_fold_reference): Only return is_gimple_min_invariant values. --- gcc/gimple-fold.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c index 6beb4f3d305..74ec36e3a78 100644 --- a/gcc/gimple-fold.c +++ b/gcc/gimple-fold.c @@ -311,27 +311,28 @@ get_symbol_constant_value (tree sym) static tree maybe_fold_reference (tree expr) { - tree result; + tree result = NULL_TREE; if ((TREE_CODE (expr) == VIEW_CONVERT_EXPR || TREE_CODE (expr) == REALPART_EXPR || TREE_CODE (expr) == IMAGPART_EXPR) && CONSTANT_CLASS_P (TREE_OPERAND (expr, 0))) - return fold_unary_loc (EXPR_LOCATION (expr), - TREE_CODE (expr), - TREE_TYPE (expr), - TREE_OPERAND (expr, 0)); - else if (TREE_CODE (expr) == BIT_FIELD_REF - && CONSTANT_CLASS_P (TREE_OPERAND (expr, 0))) - return fold_ternary_loc (EXPR_LOCATION (expr), + result = fold_unary_loc (EXPR_LOCATION (expr), TREE_CODE (expr), TREE_TYPE (expr), - TREE_OPERAND (expr, 0), - TREE_OPERAND (expr, 1), - TREE_OPERAND (expr, 2)); + TREE_OPERAND (expr, 0)); + else if (TREE_CODE (expr) == BIT_FIELD_REF + && CONSTANT_CLASS_P (TREE_OPERAND (expr, 0))) + result = fold_ternary_loc (EXPR_LOCATION (expr), + TREE_CODE (expr), + TREE_TYPE (expr), + TREE_OPERAND (expr, 0), + TREE_OPERAND (expr, 1), + TREE_OPERAND (expr, 2)); + else + result = fold_const_aggregate_ref (expr); - if ((result = fold_const_aggregate_ref (expr)) - && is_gimple_min_invariant (result)) + if (result && is_gimple_min_invariant (result)) return result; return NULL_TREE;