From patchwork Tue Apr 9 07:09:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 1081952 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-498998-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="BgBa3x3C"; 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 44ddhy1Nzqz9sRJ for ; Tue, 9 Apr 2019 17:10:09 +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:cc:subject:message-id:reply-to:mime-version :content-type; q=dns; s=default; b=izMxG6HnIuNxB+fMg+XSUkCPj1NPf qPaFFtHJBtDgnsex4XwcBiYqw+v7ceMXzFMdr8WseIVDqmYWwbVd7c8OikM13W9k MCcRMj5otmlYnUcJOwWnQcZYi9p4gIZiKXoMqgB0Guu4hDlE93IcCb1UM7rAfQIO xVxxq+G7YiG6LY= 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:cc:subject:message-id:reply-to:mime-version :content-type; s=default; bh=M/A+A+1wyzImpIFVWBC5KnK4dCs=; b=BgB a3x3CmLQNuEOrQGqtwh5eHf1U0LdKAOZYZkkZlKAqokhyySgnwRYB8ByTXjyfGOk OwVY7WyZGBDvyIM0zwgtEsqCMyTpoMUloENk/cOm5Uq2A0B4TDptQ34h0j0Gr/an 0D9ThV6vBoL/S2ozXVnwSE5g4DJnOkMqlez6BSF4= Received: (qmail 746 invoked by alias); 9 Apr 2019 07:10:03 -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 736 invoked by uid 89); 9 Apr 2019 07:10:02 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-7.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=spot, HX-Languages-Length:1116 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 09 Apr 2019 07:10:01 +0000 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 91B20308FE8F for ; Tue, 9 Apr 2019 07:10:00 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.40.205.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1E8DF5D719; Tue, 9 Apr 2019 07:09:57 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.15.2/8.15.2) with ESMTP id x3979uAp016230; Tue, 9 Apr 2019 09:09:56 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.15.2/8.15.2/Submit) id x3979tK0016229; Tue, 9 Apr 2019 09:09:55 +0200 Date: Tue, 9 Apr 2019 09:09:55 +0200 From: Jakub Jelinek To: Jason Merrill , Marek Polacek Cc: gcc-patches@gcc.gnu.org Subject: [C++ PATCH] Remove trailing space from diagnostics for narrowing conv (PR translation/90011) Message-ID: <20190409070955.GJ21066@tucnak> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.11.3 (2019-02-01) X-IsSubscribed: yes Hi! In r263523 check_narrowing changed in this spot: pedwarn (loc, OPT_Wnarrowing, - "narrowing conversion of %qE from %qH to %qI " - "inside { }", init, ftype, type); + "narrowing conversion of %qE from %qH to %qI ", + init, ftype, type); where the trailing space on one line was desirable before to separate %qI from inside { }, but now it doesn't make sense. Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? 2019-04-09 Jakub Jelinek PR translation/90011 * typeck2.c (check_narrowing): Remove trailing space from diagnostics. Jakub --- gcc/cp/typeck2.c.jj 2019-04-08 10:11:28.199226055 +0200 +++ gcc/cp/typeck2.c 2019-04-08 21:09:56.082464190 +0200 @@ -1019,7 +1019,7 @@ check_narrowing (tree type, tree init, t int savederrorcount = errorcount; global_dc->pedantic_errors = 1; pedwarn (loc, OPT_Wnarrowing, - "narrowing conversion of %qE from %qH to %qI ", + "narrowing conversion of %qE from %qH to %qI", init, ftype, type); if (errorcount == savederrorcount) ok = true;