From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by sourceware.org (Postfix) with ESMTPS id 7719D3858C53; Thu, 24 Aug 2023 06:27:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7719D3858C53 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-991c786369cso849995966b.1; Wed, 23 Aug 2023 23:27:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692858473; x=1693463273; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=12v/YamAFBU1LTIEv1q9tcWgpoVT8fwS3Rcu5nzLk5s=; b=ID9o2mJQQP1LDpxHdMmugso59swXoinXL7wlyV/eM900fBlzEaXypH2ILhynNunNLG 43vCBCIw9weM+qSNztykbbY7lZsINb0WCYVIb5ScojA/8p3a3Xp6ACVhxN0R+f3z0VWC fAu+sAKehuV+w36KCqRWN5//gafVcdm9gid5gXgcRK+shjK4l2jZyRLBJuqmEW1UTObX uHOU+YJO07NGrgy2wAsQKruQ4wP/MU52foXar3R86eA99+0auCX9kXN3P93HzT+K2/Ap 29jmxng+QgwYzKkfU0e2K/2SQXGM3wd41yZLJg9cRylTjKrw9pY0B74IzafZ9Ycub5hV a3Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692858473; x=1693463273; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=12v/YamAFBU1LTIEv1q9tcWgpoVT8fwS3Rcu5nzLk5s=; b=VLhTxxem6VCXRW2LRlWdZcutfYEG/LTveN3aTvu20Bh/ToTctI1Gr3ghZ17ZvkWVrv mg/zyk/4fkZcd5gBlbOdwDo8SHxgJPE80pVVLQs7ZiQaRUyOlBfZEP+o4LHYAtfEOk6G vdxpl+b8b+kymSvn/DBMsmkJZWkiRd7JU/oGJZ7Ha3yo8zm6eGbwPr1uwEioDtspr2iq yVR7bVN1GsyQQFlKHw9277KnrEK174foJT26bKw4JQrIhM87+mJl6FRJGfgrPI+Y5c4i dAH94uizWnfE1Pl0FrhO5H9yqy7+MnzLoyXo3rAFzw0v/f/vK8AWMvfWrT1ZG3yVKB0M 3XyA== X-Gm-Message-State: AOJu0Yw5Z4ywTu6J6NT2R36DAToQvTyizR/903aK3TWiZHWaAWtBh92k rKSUktotNhtplPEjdLR+knaIxXJi4DUmcCE9+tg= X-Google-Smtp-Source: AGHT+IF0wgAIpucpEKEd23yRw0Sjb7pK7yL/SgBNBoL8dMaUbJffUucc2Ymtamc4gJ1bzC0TbFqsCGoajkPCrDJPFyM= X-Received: by 2002:a17:906:30d6:b0:99d:ddae:f5d4 with SMTP id b22-20020a17090630d600b0099dddaef5d4mr10958264ejb.44.1692858472873; Wed, 23 Aug 2023 23:27:52 -0700 (PDT) MIME-Version: 1.0 References: <20230807211335.701619-1-jwakely@redhat.com> In-Reply-To: From: Jonathan Wakely Date: Thu, 24 Aug 2023 07:27:40 +0100 Message-ID: Subject: Re: [committed] i386: Fix grammar typo in diagnostic To: Hongtao Liu Cc: Marek Polacek , Jonathan Wakely , "libstdc++" , gcc-patches Content-Type: multipart/alternative; boundary="000000000000ee44460603a5533d" X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --000000000000ee44460603a5533d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 24 Aug 2023, 04:38 Hongtao Liu, wrote: > On Wed, Aug 23, 2023 at 4:08=E2=80=AFPM Hongtao Liu = wrote: > > > > On Wed, Aug 23, 2023 at 3:02=E2=80=AFPM Jonathan Wakely > wrote: > > > > > > > > > > > > On Wed, 23 Aug 2023, 06:15 Hongtao Liu via Libstdc++, < > libstdc++@gcc.gnu.org> wrote: > > >> > > >> On Wed, Aug 23, 2023 at 7:28=E2=80=AFAM Hongtao Liu > wrote: > > >> > > > >> > On Tue, Aug 8, 2023 at 5:22=E2=80=AFAM Marek Polacek via Libstdc++ > > >> > wrote: > > >> > > > > >> > > On Mon, Aug 07, 2023 at 10:12:35PM +0100, Jonathan Wakely via > Gcc-patches wrote: > > >> > > > Committed as obvious. > > >> > > > > > >> > > > Less obvious (to me) is whether it's correct to say "GCC V13" > here. I > > >> > > > don't think we refer to a version that way anywhere else, do w= e? > > >> > > > > > >> > > > Would "since GCC 13.1.0" be better? > > >> > > > > >> > > x86_field_alignment uses > > >> > > > > >> > > inform (input_location, "the alignment of %<_Atomic > %T%> " > > >> > > "fields changed in %{GCC > 11.1%}", > > >> > > > > >> > > so maybe the below should use %{GCC 13.1%}. "GCC V13" looks > unusual > > >> > > to me. > > >> > %{GCC 13.1%} sounds reasonable. > > >> looks like %{ can't be using in const char*, so use % > instead. > > >> > > >> How about: > > >> > > >> Author: liuhongt > > >> Date: Wed Aug 23 07:31:13 2023 +0800 > > >> > > >> Adjust GCC V13 to GCC 13.1 in diagnotic. > > >> > > >> gcc/ChangeLog: > > >> > > >> * config/i386/i386.cc (ix86_invalid_conversion): Adjust > GCC > > >> V13 to GCC 13.1. > > >> > > >> diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc > > >> index e7822ef6500..88d9d7d537f 100644 > > >> --- a/gcc/config/i386/i386.cc > > >> +++ b/gcc/config/i386/i386.cc > > >> @@ -22899,7 +22899,7 @@ ix86_invalid_conversion (const_tree fromtype, > > >> const_tree totype) > > >> || (TYPE_MODE (totype) =3D=3D BFmode > > >> && TYPE_MODE (fromtype) =3D=3D HImode)) > > >> warning (0, "%<__bfloat16%> is redefined from typedef > % " > > >> - "to real %<__bf16%> since GCC V13, be careful of " > > >> + "to real %<__bf16%> since %, be careful of > " > > >> "implicit conversion between %<__bf16%> and > %; " > > >> "an explicit bitcast may be needed here"); > > >> } > > > > > > > > > > > > Why does it need to be quoted? What's wrong with just saying GCC 13.1 > without the %< decoration? > > I'll just remove that. > pushed to trunk and backport to GCC13 release branch. > Thanks! > > > > > > > > > > >> > > >> > > > > >> > > > -- >8 -- > > >> > > > > > >> > > > gcc/ChangeLog: > > >> > > > > > >> > > > * config/i386/i386.cc (ix86_invalid_conversion): Fix > grammar. > > >> > > > --- > > >> > > > gcc/config/i386/i386.cc | 2 +- > > >> > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > >> > > > > > >> > > > diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc > > >> > > > index 50860050049..5d57726e22c 100644 > > >> > > > --- a/gcc/config/i386/i386.cc > > >> > > > +++ b/gcc/config/i386/i386.cc > > >> > > > @@ -22890,7 +22890,7 @@ ix86_invalid_conversion (const_tree > fromtype, const_tree totype) > > >> > > > warning (0, "%<__bfloat16%> is redefined from typedef > % " > > >> > > > "to real %<__bf16%> since GCC V13, be careful of= " > > >> > > > "implicit conversion between %<__bf16%> and > %; " > > >> > > > - "a explicit bitcast may be needed here"); > > >> > > > + "an explicit bitcast may be needed here"); > > >> > > > } > > >> > > > > > >> > > > /* Conversion allowed. */ > > >> > > > -- > > >> > > > 2.41.0 > > >> > > > > > >> > > > > >> > > Marek > > >> > > > > >> > > > >> > > > >> > -- > > >> > BR, > > >> > Hongtao > > >> > > >> > > >> > > >> -- > > >> BR, > > >> Hongtao > > > > > > > > -- > > BR, > > Hongtao > > > > -- > BR, > Hongtao > --000000000000ee44460603a5533d--