From patchwork Tue Mar 29 15:53:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 88804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 2748CB6EE8 for ; Wed, 30 Mar 2011 02:54:01 +1100 (EST) Received: (qmail 6404 invoked by alias); 29 Mar 2011 15:53:59 -0000 Received: (qmail 6376 invoked by uid 22791); 29 Mar 2011 15:53:56 -0000 X-SWARE-Spam-Status: No, hits=-6.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 29 Mar 2011 15:53:51 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2TFro6G019485 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 29 Mar 2011 11:53:50 -0400 Received: from tyan-ft48-01.lab.bos.redhat.com (tyan-ft48-01.lab.bos.redhat.com [10.16.42.4]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p2TFrn2L000431 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 29 Mar 2011 11:53:50 -0400 Received: from tyan-ft48-01.lab.bos.redhat.com (localhost.localdomain [127.0.0.1]) by tyan-ft48-01.lab.bos.redhat.com (8.14.4/8.14.4) with ESMTP id p2TFrnWM025457 for ; Tue, 29 Mar 2011 17:53:49 +0200 Received: (from jakub@localhost) by tyan-ft48-01.lab.bos.redhat.com (8.14.4/8.14.4/Submit) id p2TFrmfU025456 for gcc-patches@gcc.gnu.org; Tue, 29 Mar 2011 17:53:48 +0200 Date: Tue, 29 Mar 2011 17:53:48 +0200 From: Jakub Jelinek To: gcc-patches@gcc.gnu.org Subject: [PATCH] Another EQ/NE folder type fix (PR c/48305) Message-ID: <20110329155348.GL18914@tyan-ft48-01.lab.bos.redhat.com> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes 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 Hi! I've left these 4 out because I thought they should be fine given that the other operands are equal. But the testcase shows I was wrong. Fixed thusly, bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? 2011-03-29 Jakub Jelinek PR c/48305 * fold-const.c (fold_binary_loc) : Make sure arg10/arg11 in (X ^ Y) == (Z ^ W) are always fold converted to matching arg00/arg01 types. * gcc.c-torture/compile/pr48305.c: New test. Jakub --- gcc/fold-const.c.jj 2011-03-25 07:56:32.000000000 +0100 +++ gcc/fold-const.c 2011-03-28 12:45:58.000000000 +0200 @@ -12625,13 +12625,21 @@ fold_binary_loc (location_t loc, operand_equal_p guarantees no side-effects so we don't need to use omit_one_operand on Z. */ if (operand_equal_p (arg01, arg11, 0)) - return fold_build2_loc (loc, code, type, arg00, arg10); + return fold_build2_loc (loc, code, type, arg00, + fold_convert_loc (loc, TREE_TYPE (arg00), + arg10)); if (operand_equal_p (arg01, arg10, 0)) - return fold_build2_loc (loc, code, type, arg00, arg11); + return fold_build2_loc (loc, code, type, arg00, + fold_convert_loc (loc, TREE_TYPE (arg00), + arg11)); if (operand_equal_p (arg00, arg11, 0)) - return fold_build2_loc (loc, code, type, arg01, arg10); + return fold_build2_loc (loc, code, type, arg01, + fold_convert_loc (loc, TREE_TYPE (arg01), + arg10)); if (operand_equal_p (arg00, arg10, 0)) - return fold_build2_loc (loc, code, type, arg01, arg11); + return fold_build2_loc (loc, code, type, arg01, + fold_convert_loc (loc, TREE_TYPE (arg01), + arg11)); /* Optimize (X ^ C1) op (Y ^ C2) as (X ^ (C1 ^ C2)) op Y. */ if (TREE_CODE (arg01) == INTEGER_CST --- gcc/testsuite/gcc.c-torture/compile/pr48305.c.jj 2011-03-28 12:48:02.000000000 +0200 +++ gcc/testsuite/gcc.c-torture/compile/pr48305.c 2011-03-28 12:47:49.000000000 +0200 @@ -0,0 +1,7 @@ +/* PR c/48305 */ + +int +foo (int x) +{ + return (x ^ 1) == (x ^ 1U); +}