diff options
| author | marxin <marxin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-06-22 11:18:57 +0000 |
|---|---|---|
| committer | marxin <marxin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-06-22 11:18:57 +0000 |
| commit | b4c35c5e1925ebd5edf40b7655dee4c1f08a229c (patch) | |
| tree | b7239382db55a1eed17de790261a03da6d4eb23c /gcc | |
| parent | 2caa2d1e455a1adf482886c2c022a7c7bf752848 (diff) | |
| download | gcc-b4c35c5e1925ebd5edf40b7655dee4c1f08a229c.tar.gz | |
Backport r248089
2017-06-22 Martin Liska <mliska@suse.cz>
Backport from mainline
2017-05-16 Martin Liska <mliska@suse.cz>
PR ipa/79849.
PR ipa/79850.
* ipa-devirt.c (warn_types_mismatch): Fix typo.
(odr_types_equivalent_p): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249522 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/ipa-devirt.c | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ae7e2d980bf..bfe0a4d45ec 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,16 @@ 2017-06-22 Martin Liska <mliska@suse.cz> Backport from mainline + 2017-05-16 Martin Liska <mliska@suse.cz> + + PR ipa/79849. + PR ipa/79850. + * ipa-devirt.c (warn_types_mismatch): Fix typo. + (odr_types_equivalent_p): Likewise. + +2017-06-22 Martin Liska <mliska@suse.cz> + + Backport from mainline 2017-05-15 Martin Liska <mliska@suse.cz> PR driver/31468 diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c index 0332b3ec616..9853c4a499c 100644 --- a/gcc/ipa-devirt.c +++ b/gcc/ipa-devirt.c @@ -1225,7 +1225,7 @@ warn_types_mismatch (tree t1, tree t2, location_t loc1, location_t loc2) if (types_odr_comparable (t1, t2, true) && types_same_for_odr (t1, t2, true)) inform (loc_t1, - "type %qT itself violate the C++ One Definition Rule", t1); + "type %qT itself violates the C++ One Definition Rule", t1); /* Prevent pointless warnings like "struct aa" should match "struct aa". */ else if (TYPE_NAME (t1) == TYPE_NAME (t2) && TREE_CODE (t1) == TREE_CODE (t2) && !loc_t2_useful) @@ -1572,7 +1572,7 @@ odr_types_equivalent_p (tree t1, tree t2, bool warn, bool *warned, if (DECL_ARTIFICIAL (f1)) break; warn_odr (t1, t2, f1, f2, warn, warned, - G_("fields has different layout " + G_("fields have different layout " "in another translation unit")); return false; } |