| Message ID | 20190307193223.GC7611@tucnak |
|---|---|
| State | New |
| Headers | show |
| Series | Two diagnostics fixes for ipa-devirt.c (PR ipa/80000, PR target/85665) | expand |
On Thu, Mar 7, 2019 at 8:32 PM Jakub Jelinek <jakub@redhat.com> wrote: > > Hi! > > The following patch fixes two diagnostics issues in ipa-devirt.c, one > is trailing space in one warning, the other is lack of articles in another > warning, both reported by the translation team. > > Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? OK. RIchard. > 2019-03-07 Jakub Jelinek <jakub@redhat.com> > > PR ipa/80000 > * ipa-devirt.c (compare_virtual_tables): Remove two trailing spaces > from diagnostics. Formatting fixes. > > PR target/85665 > * ipa-devirt.c (odr_types_equivalent_p): Fix grammar in > warn_odr diagnostics. > > --- gcc/ipa-devirt.c.jj 2019-01-10 11:43:14.380377810 +0100 > +++ gcc/ipa-devirt.c 2019-03-07 16:21:14.641937211 +0100 > @@ -842,17 +842,16 @@ compare_virtual_tables (varpool_node *pr > { > class_type->odr_violated = true; > auto_diagnostic_group d; > - if (warning_at (DECL_SOURCE_LOCATION > - (TYPE_NAME (DECL_CONTEXT (vtable->decl))), > - OPT_Wodr, > + tree ctx = TYPE_NAME (DECL_CONTEXT (vtable->decl)); > + if (warning_at (DECL_SOURCE_LOCATION (ctx), OPT_Wodr, > "virtual table of type %qD violates " > - "one definition rule ", > + "one definition rule", > DECL_CONTEXT (vtable->decl))) > { > - inform (DECL_SOURCE_LOCATION > - (TYPE_NAME (DECL_CONTEXT (prevailing->decl))), > - "the conflicting type defined in another translation " > - "unit has virtual table of different size"); > + ctx = TYPE_NAME (DECL_CONTEXT (prevailing->decl)); > + inform (DECL_SOURCE_LOCATION (ctx), > + "the conflicting type defined in another translation" > + " unit has virtual table of different size"); > } > } > return; > @@ -1607,7 +1606,8 @@ odr_types_equivalent_p (tree t1, tree t2 > if (DECL_BIT_FIELD (f1) != DECL_BIT_FIELD (f2)) > { > warn_odr (t1, t2, f1, f2, warn, warned, > - G_("one field is bitfield while other is not")); > + G_("one field is a bitfield while the other " > + "is not")); > return false; > } > else > > Jakub
--- gcc/ipa-devirt.c.jj 2019-01-10 11:43:14.380377810 +0100 +++ gcc/ipa-devirt.c 2019-03-07 16:21:14.641937211 +0100 @@ -842,17 +842,16 @@ compare_virtual_tables (varpool_node *pr { class_type->odr_violated = true; auto_diagnostic_group d; - if (warning_at (DECL_SOURCE_LOCATION - (TYPE_NAME (DECL_CONTEXT (vtable->decl))), - OPT_Wodr, + tree ctx = TYPE_NAME (DECL_CONTEXT (vtable->decl)); + if (warning_at (DECL_SOURCE_LOCATION (ctx), OPT_Wodr, "virtual table of type %qD violates " - "one definition rule ", + "one definition rule", DECL_CONTEXT (vtable->decl))) { - inform (DECL_SOURCE_LOCATION - (TYPE_NAME (DECL_CONTEXT (prevailing->decl))), - "the conflicting type defined in another translation " - "unit has virtual table of different size"); + ctx = TYPE_NAME (DECL_CONTEXT (prevailing->decl)); + inform (DECL_SOURCE_LOCATION (ctx), + "the conflicting type defined in another translation" + " unit has virtual table of different size"); } } return; @@ -1607,7 +1606,8 @@ odr_types_equivalent_p (tree t1, tree t2 if (DECL_BIT_FIELD (f1) != DECL_BIT_FIELD (f2)) { warn_odr (t1, t2, f1, f2, warn, warned, - G_("one field is bitfield while other is not")); + G_("one field is a bitfield while the other " + "is not")); return false; } else