From patchwork Fri Apr 29 09:37:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 53346 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 9DD5B385735D for ; Fri, 29 Apr 2022 09:38:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9DD5B385735D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1651225102; bh=SJ5oPkZtUsg8uDrdNzB6NdLV0vSKL4MxViTFB/DKs1E=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=sEddMUMjlSOqb7dzYDoaQIG9EhGWr4RiDV85U3d8rxUDIT7ygz/rs+UiDjBuGbTZ0 YIyr84O3Ryvtj+9QY6Pnl+n1szMr9q7XZ3TwZTpDGXqMxhdXtA9JhwW05R1wmJ+LwW 4iSx9PEKTChJPCdvdEd4RM9PiH9NVPkdvpwLATqw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 54DCF385780C for ; Fri, 29 Apr 2022 09:37:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 54DCF385780C 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-out1.suse.de (Postfix) with ESMTPS id 24496210EB; Fri, 29 Apr 2022 09:37:53 +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 0BB5313AE0; Fri, 29 Apr 2022 09:37:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cj6pAfGxa2KaCAAAMHmgww (envelope-from ); Fri, 29 Apr 2022 09:37:53 +0000 Date: Fri, 29 Apr 2022 11:37:52 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] Use CASE_CONVERT in a few more cases MIME-Version: 1.0 Message-Id: <20220429093753.0BB5313AE0@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-11.7 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" This uses CASE_CONVERT more which eases eventual removal of NOP_EXPR. Bootstrapped and tested on x86_64-unknown-linux-gnu, OK for trunk? Jason, from the experiment this is from I know that the C++ FE distinguishes between CONVERT_EXPR and NOP_EXPR at the moment, are the C++ bits nevertheless OK? 2022-04-29 Richard Biener cp/ * constexpr.cc (fold_simple_1): Use CASE_CONVERT. * cp-gimplify.cc (cp_fold): Likewise. * pt.cc (tsubst_copy): Likewise. * dojump.cc (do_jump): Use CASE_CONVERT. * tree-ssa-dom.cc (edge_info::derive_equivalences): Likewise. --- gcc/cp/constexpr.cc | 3 +-- gcc/cp/cp-gimplify.cc | 3 +-- gcc/cp/pt.cc | 3 +-- gcc/dojump.cc | 4 +--- gcc/tree-ssa-dom.cc | 3 +-- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc index 47d5113ace2..c40efa6cc4e 100644 --- a/gcc/cp/constexpr.cc +++ b/gcc/cp/constexpr.cc @@ -8016,9 +8016,8 @@ fold_simple_1 (tree t) case NEGATE_EXPR: case BIT_NOT_EXPR: case TRUTH_NOT_EXPR: - case NOP_EXPR: case VIEW_CONVERT_EXPR: - case CONVERT_EXPR: + CASE_CONVERT: case FLOAT_EXPR: case FIX_TRUNC_EXPR: case FIXED_CONVERT_EXPR: diff --git a/gcc/cp/cp-gimplify.cc b/gcc/cp/cp-gimplify.cc index e4c2644af15..b52d9cb5754 100644 --- a/gcc/cp/cp-gimplify.cc +++ b/gcc/cp/cp-gimplify.cc @@ -2451,9 +2451,8 @@ cp_fold (tree x) case VIEW_CONVERT_EXPR: rval_ops = false; /* FALLTHRU */ - case CONVERT_EXPR: - case NOP_EXPR: case NON_LVALUE_EXPR: + CASE_CONVERT: if (VOID_TYPE_P (TREE_TYPE (x))) { diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 81f7ef5c42b..83600d52b33 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -17152,8 +17152,7 @@ tsubst_copy (tree t, tree args, tsubst_flags_t complain, tree in_decl) case STATIC_CAST_EXPR: case DYNAMIC_CAST_EXPR: case IMPLICIT_CONV_EXPR: - case CONVERT_EXPR: - case NOP_EXPR: + CASE_CONVERT: { tsubst_flags_t tcomplain = complain; if (code == CAST_EXPR) diff --git a/gcc/dojump.cc b/gcc/dojump.cc index 0c880d65338..17a73da7448 100644 --- a/gcc/dojump.cc +++ b/gcc/dojump.cc @@ -421,14 +421,12 @@ do_jump (tree exp, rtx_code_label *if_false_label, break; #endif - case NOP_EXPR: + CASE_CONVERT: if (TREE_CODE (TREE_OPERAND (exp, 0)) == COMPONENT_REF || TREE_CODE (TREE_OPERAND (exp, 0)) == BIT_FIELD_REF || TREE_CODE (TREE_OPERAND (exp, 0)) == ARRAY_REF || TREE_CODE (TREE_OPERAND (exp, 0)) == ARRAY_RANGE_REF) goto normal; - /* FALLTHRU */ - case CONVERT_EXPR: /* If we are narrowing the operand, we have to do the compare in the narrower mode. */ if ((TYPE_PRECISION (TREE_TYPE (exp)) diff --git a/gcc/tree-ssa-dom.cc b/gcc/tree-ssa-dom.cc index 4a0cf2ef54c..89b05171d57 100644 --- a/gcc/tree-ssa-dom.cc +++ b/gcc/tree-ssa-dom.cc @@ -220,8 +220,7 @@ edge_info::derive_equivalences (tree name, tree value, int recursion_limit) /* If LHS is an SSA_NAME and RHS is a constant integer and LHS was set via a widening type conversion, then we may be able to record additional equivalences. */ - case NOP_EXPR: - case CONVERT_EXPR: + CASE_CONVERT: { tree rhs = gimple_assign_rhs1 (def_stmt); tree rhs_type = TREE_TYPE (rhs);