From patchwork Tue May 15 11:29:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 159296 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 36841B6FC8 for ; Tue, 15 May 2012 21:30:31 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1337686232; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Message-ID:Date:From:User-Agent:MIME-Version: To:CC:Subject:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=PB+gzq9OMu16HNgJ+Vflq5xyqJA=; b=TBVZC2fSnCv5Ssk vIz77sLLxBDF1HtUe//dyEbCIvABWmAcqxC6wEtVFp2C/FwSbJhv07VLaK83AT8A WjFzpIfsStNwMwLf66byp7Fyx+ZrQ316NSDKDwoauaZxOmiFFzRQrFZVdgVJj/Jl jfu1DgYKy9yE7HiXhhRVeV6A2XFc= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=QIIT7CaGU9vbkmbIG8/scxSP0tpLhK6wiVH5F8chzU30wKrNwJ/57iTwQHm5qV qjCWSkVzVHNNSC6aaNb3iU6/AHyt6IaRGAxerLINbi9sWSYQxiycVxUTVZN5Nlv1 JCFaEIo/v5tOg+IRL5Hwalj+zbRK1V6AT3sfJ9xm4zVWw=; Received: (qmail 1584 invoked by alias); 15 May 2012 11:30:24 -0000 Received: (qmail 1572 invoked by uid 22791); 15 May 2012 11:30:22 -0000 X-SWARE-Spam-Status: No, hits=-6.5 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_NO, RCVD_IN_HOSTKARMA_W, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from rcsinet15.oracle.com (HELO rcsinet15.oracle.com) (148.87.113.117) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 15 May 2012 11:30:09 +0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q4FBU79C023477 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 May 2012 11:30:08 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q4FBU6Vl018782 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 15 May 2012 11:30:07 GMT Received: from abhmt101.oracle.com (abhmt101.oracle.com [141.146.116.53]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q4FBU6Eq032158; Tue, 15 May 2012 06:30:06 -0500 Received: from [192.168.1.4] (/79.52.195.202) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 15 May 2012 04:30:06 -0700 Message-ID: <4FB23E07.1010602@oracle.com> Date: Tue, 15 May 2012 13:29:11 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120421 Thunderbird/12.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: Jason Merrill Subject: [C++ Patch] PR 11586 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, this small patch fixes the problem using the approach indicated by Jason in the audit trail, already used in many other similar cases. Booted and tested x86_64-linux. Thanks, Paolo. ///////////////////////// /cp 2012-05-15 Paolo Carlini PR c++/11586 * pt.c (tsubst_copy_and_build): Increase / decrease c_inhibit_evaluation_warnings around build_x_binary_op call. /c-family 2012-05-15 Paolo Carlini PR c++/11586 * c-common.c (shorten_compare): Check c_inhibit_evaluation_warnings. /testsuite 2012-05-15 Paolo Carlini PR c++/11586 * g++.dg/warn/Wtype-limits.C: Don't warn in templates. * g++.dg/warn/Wtype-limits-Wextra.C: Likewise. Index: testsuite/g++.dg/warn/Wtype-limits-Wextra.C =================================================================== --- testsuite/g++.dg/warn/Wtype-limits-Wextra.C (revision 187501) +++ testsuite/g++.dg/warn/Wtype-limits-Wextra.C (working copy) @@ -66,7 +66,7 @@ int test (int x) template void f(Int x) { - assert(0 <= x and x <= D); // { dg-warning "comparison is always true due to limited range of data type" } + assert(0 <= x and x <= D); } int ff(void) { Index: testsuite/g++.dg/warn/Wtype-limits.C =================================================================== --- testsuite/g++.dg/warn/Wtype-limits.C (revision 187501) +++ testsuite/g++.dg/warn/Wtype-limits.C (working copy) @@ -66,7 +66,7 @@ int test (int x) template void f(Int x) { - assert(0 <= x and x <= D); // { dg-warning "comparison is always true due to limited range of data type" } + assert(0 <= x and x <= D); } int ff(void) { Index: cp/pt.c =================================================================== --- cp/pt.c (revision 187501) +++ cp/pt.c (working copy) @@ -13608,7 +13610,11 @@ tsubst_copy_and_build (tree t, case MEMBER_REF: case DOTSTAR_EXPR: { - tree r = build_x_binary_op + tree r; + + ++c_inhibit_evaluation_warnings; + + r = build_x_binary_op (input_location, TREE_CODE (t), RECUR (TREE_OPERAND (t, 0)), (TREE_NO_WARNING (TREE_OPERAND (t, 0)) @@ -13622,6 +13628,9 @@ tsubst_copy_and_build (tree t, complain); if (EXPR_P (r) && TREE_NO_WARNING (t)) TREE_NO_WARNING (r) = TREE_NO_WARNING (t); + + --c_inhibit_evaluation_warnings; + return r; } Index: c-family/c-common.c =================================================================== --- c-family/c-common.c (revision 187501) +++ c-family/c-common.c (working copy) @@ -3754,7 +3754,8 @@ shorten_compare (tree *op0_ptr, tree *op1_ptr, tre type = c_common_unsigned_type (type); } - if (TREE_CODE (primop0) != INTEGER_CST) + if (TREE_CODE (primop0) != INTEGER_CST + && c_inhibit_evaluation_warnings == 0) { if (val == truthvalue_false_node) warning_at (loc, OPT_Wtype_limits, @@ -3834,6 +3835,7 @@ shorten_compare (tree *op0_ptr, tree *op1_ptr, tre warning. */ bool warn = warn_type_limits && !in_system_header + && c_inhibit_evaluation_warnings == 0 && !(TREE_CODE (primop0) == INTEGER_CST && !TREE_OVERFLOW (convert (c_common_signed_type (type), primop0)))