From patchwork Tue Aug 20 12:01:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1150072 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-507370-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="TghJu0o2"; 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 46CTtS0P02z9s3Z for ; Tue, 20 Aug 2019 22:02:05 +1000 (AEST) 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=SnNwRCtA7vvEF2sf1YunXDZpSO/xwJJaD527jE1zXo5IaE0Qk0cNg dcZJX6DMmK7MMZp5HiEFG6ZJeF1VIjDL1qfQMRNMwUrmrEvMHj6bisNlMwWCtegh dQXyx7ZL3HWNEFcZFMVznK+Fe5fCTN5NO7XhuEQUYPCQ3zxf4AvGgU= 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=47LLg5kCbq0SQ8HRkexWlxbXYOU=; b=TghJu0o2sG9zMRlul8qm kRMizWdhZdToc85wJt2edlqeS5cnHe9Qx10zjk3IGv+WMF1TOWWnq+bLOESK+OXP havwoW2DGL5E7nUXUNoLSxmpBWZxjjE4oIWrP5Dg8qCFAXukwXc+HWBAH8+8830g GMUWDZcxZOqjulsUMZFosVg= Received: (qmail 7242 invoked by alias); 20 Aug 2019 12:01:58 -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 7234 invoked by uid 89); 20 Aug 2019 12:01:58 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-10.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, KAM_NUMSUBJECT, SPF_PASS autolearn=ham version=3.3.1 spammy=37242 X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 20 Aug 2019 12:01:56 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id C64DDADD9 for ; Tue, 20 Aug 2019 12:01:54 +0000 (UTC) Date: Tue, 20 Aug 2019 14:01:54 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] Fix PR37242 Message-ID: User-Agent: Alpine 2.20 (LSU 67 2015-01-07) MIME-Version: 1.0 The following should fix PR37242. Bootstrapped and tested on x86_64-unknown-linux-gnu, applied to trunk. Richard. 2019-08-20 Richard Biener PR tree-optimization/37242 * tree-ssa-sccvn.c (visit_nary_op): Also CSE (T)(a + b) to (T)a + (T)b if we know that a + b does not overflow. * gcc.dg/tree-ssa/ssa-fre-80.c: New testcase. Index: gcc/tree-ssa-sccvn.c =================================================================== --- gcc/tree-ssa-sccvn.c (revision 274672) +++ gcc/tree-ssa-sccvn.c (working copy) @@ -4312,8 +4312,12 @@ visit_nary_op (tree lhs, gassign *stmt) operation. */ if (INTEGRAL_TYPE_P (type) && TREE_CODE (rhs1) == SSA_NAME - /* We only handle sign-changes or zero-extension -> & mask. */ - && ((TYPE_UNSIGNED (TREE_TYPE (rhs1)) + /* We only handle sign-changes, zero-extension -> & mask or + sign-extension if we know the inner operation doesn't + overflow. */ + && (((TYPE_UNSIGNED (TREE_TYPE (rhs1)) + || (INTEGRAL_TYPE_P (TREE_TYPE (rhs1)) + && TYPE_OVERFLOW_UNDEFINED (TREE_TYPE (rhs1)))) && TYPE_PRECISION (type) > TYPE_PRECISION (TREE_TYPE (rhs1))) || TYPE_PRECISION (type) == TYPE_PRECISION (TREE_TYPE (rhs1)))) { @@ -4347,7 +4351,9 @@ visit_nary_op (tree lhs, gassign *stmt) { unsigned lhs_prec = TYPE_PRECISION (type); unsigned rhs_prec = TYPE_PRECISION (TREE_TYPE (rhs1)); - if (lhs_prec == rhs_prec) + if (lhs_prec == rhs_prec + || (INTEGRAL_TYPE_P (TREE_TYPE (rhs1)) + && TYPE_OVERFLOW_UNDEFINED (TREE_TYPE (rhs1)))) { gimple_match_op match_op (gimple_match_cond::UNCOND, NOP_EXPR, type, ops[0]); Index: gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-80.c =================================================================== --- gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-80.c (nonexistent) +++ gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-80.c (working copy) @@ -0,0 +1,16 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-fre1" } */ + +unsigned long a, b; +void foo (int m, int f) +{ + unsigned long tem = (unsigned long)m; + a = tem + 1; + if (f) + { + int tem2 = m + 1; + b = (unsigned long)tem2; /* Eliminated to a. */ + } +} + +/* { dg-final { scan-tree-dump-times "\\(long unsigned int\\)" 1 "fre1" } } */