From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 41000 invoked by alias); 30 May 2017 19:43:39 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 40988 invoked by uid 89); 30 May 2017 19:43:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.5 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_LOW,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qt0-f178.google.com Received: from mail-qt0-f178.google.com (HELO mail-qt0-f178.google.com) (209.85.216.178) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 30 May 2017 19:43:36 +0000 Received: by mail-qt0-f178.google.com with SMTP id v27so78728765qtg.2 for ; Tue, 30 May 2017 12:43:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version; bh=5cSwVDjwKicvRT/CwUFpZEepGPGAm1iVnuPrMfPDj4s=; b=jDIRPXnIMjTCYRVbPMIqnN1b6HTvcMebMx0b6ksXocGPdlMAO8Hk54gBp+nCQWS8ur vF7O2ZNONbQmxb7VfPHRZP+URb/ncT7TCt6v2Q5V1OmaIe6mMQ9/ngW+eL4GskhNpXNw SvCh3z64nzEwxJsP62TpSRb/lqPWO0tvYjDtg0i30X9iz+7szPPtw4f1WauS22qgPYLf ZykZBwdsP0IT/4MYu300fPvHjX6WR1mIvbBLlT+fe/lDMkZbH6hd5MhaABl9Kbo+CM38 VEfCTq2a/pVQOPOQ7jTmu4e2X92xMSwI5vKaPBt+iEeOmuAWpZDo30yVAFSQs9k3sMtV Cgxw== X-Gm-Message-State: AODbwcBobgVBfED/3HsEYkpM3MY3dk929vUBrTrx4fs6fuaXbOWAgl9Q XASx9n0qfvEGYBfo X-Received: by 10.237.53.149 with SMTP id c21mr27904701qte.191.1496173419032; Tue, 30 May 2017 12:43:39 -0700 (PDT) Received: from localhost.localdomain (75-166-125-146.hlrn.qwest.net. [75.166.125.146]) by smtp.gmail.com with ESMTPSA id y48sm8887329qta.66.2017.05.30.12.43.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 May 2017 12:43:38 -0700 (PDT) To: Gcc Patch List , Joseph Myers From: Martin Sebor Subject: [PATCH] use the right conversion warning option (PR c/80892) Message-ID: <37d08c31-3643-0cb7-18e5-24d477a53dd8@gmail.com> Date: Tue, 30 May 2017 19:54:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------A9075B41E124751C4530F18D" X-IsSubscribed: yes X-SW-Source: 2017-05/txt/msg02289.txt.bz2 This is a multi-part message in MIME format. --------------A9075B41E124751C4530F18D Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-length: 189 The conversion enhancements I committed in r248431 introduced an unintended change in which warning option is used to issue certain integer conversion warnings. Attached is a fix. Martin --------------A9075B41E124751C4530F18D Content-Type: text/x-patch; name="gcc-80892.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="gcc-80892.diff" Content-length: 1897 PR c/80892 - -Wfloat-conversion now warns about non-floats gcc/c-family/ChangeLog: PR c/80892 * c-warn.c (conversion_warning): Use -Wconversion for integer conversion and -Wfloat-conversion for floating one. gcc/testsuite/ChangeLog: PR c/80892 * c-c++-common/Wfloat-conversion-2.c: New test. diff --git a/gcc/c-family/c-warn.c b/gcc/c-family/c-warn.c index 012675b..35321a6 100644 --- a/gcc/c-family/c-warn.c +++ b/gcc/c-family/c-warn.c @@ -1043,10 +1043,19 @@ conversion_warning (location_t loc, tree type, tree expr, tree result) "conversion from %qT to to %qT discards imaginary " "component", expr_type, type); - else if (conversion_kind == UNSAFE_REAL || conversion_kind) - warning_at (loc, OPT_Wfloat_conversion, - "conversion from %qT to %qT may change value", - expr_type, type); + else + { + int warnopt; + if (conversion_kind == UNSAFE_REAL) + warnopt = OPT_Wfloat_conversion; + else if (conversion_kind) + warnopt = OPT_Wconversion; + else + break; + warning_at (loc, warnopt, + "conversion from %qT to %qT may change value", + expr_type, type); + } } } diff --git a/gcc/testsuite/c-c++-common/Wfloat-conversion-2.c b/gcc/testsuite/c-c++-common/Wfloat-conversion-2.c new file mode 100644 index 0000000..626e35b --- /dev/null +++ b/gcc/testsuite/c-c++-common/Wfloat-conversion-2.c @@ -0,0 +1,19 @@ +/* PR c/80892 - [8 regression] -Wfloat-conversion now warns about non-floats + { dg-do compile } + { dg-options "-Wconversion -Wfloat-conversion" } + { dg-require-effective-target int32plus } + { dg-require-effective-target double64plus } */ + +void fschar (char); + +void fulong (unsigned long x) +{ + fschar (x); /* { dg-warning "\\[-Wconversion\\]" } */ +} + +void ffloat (float); + +void fdouble (double x) +{ + ffloat (x); /* { dg-warning "\\[-Wfloat-conversion\\]" } */ +} --------------A9075B41E124751C4530F18D--