From patchwork Mon Nov 27 14:34:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 841721 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-467958-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="XqNM1f/X"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ylq7T0HGYz9sP9 for ; Tue, 28 Nov 2017 01:34:27 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=BuWtBPtkPn+eXvpP2ZdiwLgvDpPbMBG7HRVBKeyt29x6k1VYfhcky AL57ycJosOyTOMjjX4hhOCmP+UzpgF9Fbc2z6ne03XGFfbtG52ygJa9ocsh+oeDs uUvLHB6nZoX9I209ELnvlhzeu4wzTllNH9YRQYA+P1HVI8+V00eTYo= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=U9R+hGEn46Ri7bDSSED8OdtXQP4=; b=XqNM1f/X8yewZ/tRT6yT I2CODWjp3m1ZbXIVTeR8NWCxS9as5b5EhfNrKEZ1qMHwWmhe6B4P5Qi41E+wHGmf ND++48x55gbKywO8G1bTX8/6Yy/DeMRmkqfDdmJ7+HaJsOMXqVyLdnvJWQtedUH3 9JTbYhE6LegTKud8qP/DT10= Received: (qmail 76855 invoked by alias); 27 Nov 2017 14:34:19 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 76843 invoked by uid 89); 27 Nov 2017 14:34:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, KB_WAM_FROM_NAME_SINGLEWORD, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-HELO: mx2.suse.de Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 27 Nov 2017 14:34:12 +0000 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id B171EAAAD for ; Mon, 27 Nov 2017 14:34:09 +0000 (UTC) Date: Mon, 27 Nov 2017 15:34:09 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH][1/2] gimple-fold.c part of PR83141 Message-ID: User-Agent: Alpine 2.20 (LSU 67 2015-01-07) MIME-Version: 1.0 This is removing dead code from the times this was folding on GENERIC and refactors things a tiny bit. Bootstrapped and tested on x86_64-unknown-linux-gnu, applied. Richard. 2017-11-27 Richard Biener * gimple-fold.c (gimple_fold_builtin_memory_op): Remove dead code, refactor a bit. Index: gcc/gimple-fold.c =================================================================== --- gcc/gimple-fold.c (revision 255171) +++ gcc/gimple-fold.c (working copy) @@ -927,12 +927,6 @@ gimple_fold_builtin_memory_op (gimple_st if (!tree_fits_shwi_p (len)) return false; - /* FIXME: - This logic lose for arguments like (type *)malloc (sizeof (type)), - since we strip the casts of up to VOID return value from malloc. - Perhaps we ought to inherit type from non-VOID argument here? */ - STRIP_NOPS (src); - STRIP_NOPS (dest); if (!POINTER_TYPE_P (TREE_TYPE (src)) || !POINTER_TYPE_P (TREE_TYPE (dest))) return false; @@ -942,37 +936,14 @@ gimple_fold_builtin_memory_op (gimple_st using that type. In theory we could always use a char[len] type but that only gains us that the destination and source possibly no longer will have their address taken. */ - /* As we fold (void *)(p + CST) to (void *)p + CST undo this here. */ - if (TREE_CODE (src) == POINTER_PLUS_EXPR) - { - tree tem = TREE_OPERAND (src, 0); - STRIP_NOPS (tem); - if (tem != TREE_OPERAND (src, 0)) - src = build1 (NOP_EXPR, TREE_TYPE (tem), src); - } - if (TREE_CODE (dest) == POINTER_PLUS_EXPR) - { - tree tem = TREE_OPERAND (dest, 0); - STRIP_NOPS (tem); - if (tem != TREE_OPERAND (dest, 0)) - dest = build1 (NOP_EXPR, TREE_TYPE (tem), dest); - } srctype = TREE_TYPE (TREE_TYPE (src)); if (TREE_CODE (srctype) == ARRAY_TYPE && !tree_int_cst_equal (TYPE_SIZE_UNIT (srctype), len)) - { - srctype = TREE_TYPE (srctype); - STRIP_NOPS (src); - src = build1 (NOP_EXPR, build_pointer_type (srctype), src); - } + srctype = TREE_TYPE (srctype); desttype = TREE_TYPE (TREE_TYPE (dest)); if (TREE_CODE (desttype) == ARRAY_TYPE && !tree_int_cst_equal (TYPE_SIZE_UNIT (desttype), len)) - { - desttype = TREE_TYPE (desttype); - STRIP_NOPS (dest); - dest = build1 (NOP_EXPR, build_pointer_type (desttype), dest); - } + desttype = TREE_TYPE (desttype); if (TREE_ADDRESSABLE (srctype) || TREE_ADDRESSABLE (desttype)) return false; @@ -1000,43 +971,34 @@ gimple_fold_builtin_memory_op (gimple_st || src_align < TYPE_ALIGN (srctype)) return false; - destvar = dest; - STRIP_NOPS (destvar); - if (TREE_CODE (destvar) == ADDR_EXPR - && var_decl_component_p (TREE_OPERAND (destvar, 0)) + destvar = NULL_TREE; + if (TREE_CODE (dest) == ADDR_EXPR + && var_decl_component_p (TREE_OPERAND (dest, 0)) && tree_int_cst_equal (TYPE_SIZE_UNIT (desttype), len)) - destvar = fold_build2 (MEM_REF, desttype, destvar, off0); - else - destvar = NULL_TREE; - - srcvar = src; - STRIP_NOPS (srcvar); - if (TREE_CODE (srcvar) == ADDR_EXPR - && var_decl_component_p (TREE_OPERAND (srcvar, 0)) + destvar = fold_build2 (MEM_REF, desttype, dest, off0); + + srcvar = NULL_TREE; + if (TREE_CODE (src) == ADDR_EXPR + && var_decl_component_p (TREE_OPERAND (src, 0)) && tree_int_cst_equal (TYPE_SIZE_UNIT (srctype), len)) { if (!destvar || src_align >= TYPE_ALIGN (desttype)) srcvar = fold_build2 (MEM_REF, destvar ? desttype : srctype, - srcvar, off0); + src, off0); else if (!STRICT_ALIGNMENT) { srctype = build_aligned_type (TYPE_MAIN_VARIANT (desttype), src_align); - srcvar = fold_build2 (MEM_REF, srctype, srcvar, off0); + srcvar = fold_build2 (MEM_REF, srctype, src, off0); } - else - srcvar = NULL_TREE; } - else - srcvar = NULL_TREE; if (srcvar == NULL_TREE && destvar == NULL_TREE) return false; if (srcvar == NULL_TREE) { - STRIP_NOPS (src); if (src_align >= TYPE_ALIGN (desttype)) srcvar = fold_build2 (MEM_REF, desttype, src, off0); else @@ -1050,7 +1012,6 @@ gimple_fold_builtin_memory_op (gimple_st } else if (destvar == NULL_TREE) { - STRIP_NOPS (dest); if (dest_align >= TYPE_ALIGN (srctype)) destvar = fold_build2 (MEM_REF, srctype, dest, off0); else