aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2017-05-16 10:57:05 +0200
committerMartin Liska <marxin@gcc.gnu.org>2017-05-16 08:57:05 +0000
commitd8c9bc362740560b8d8fbfd4d464d2cbde7591f2 (patch)
tree6b0632a276cca996818ddeae0783d06caedd0eb0
parent3fc5147b9ba44ff5b8567d6c71b184cbe9595a96 (diff)
downloadgcc-d8c9bc362740560b8d8fbfd4d464d2cbde7591f2.zip
gcc-d8c9bc362740560b8d8fbfd4d464d2cbde7591f2.tar.gz
gcc-d8c9bc362740560b8d8fbfd4d464d2cbde7591f2.tar.bz2
Fix 2 typos in ipa-devirt.c.
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. From-SVN: r248089
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/ipa-devirt.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 48f1bee..cad792b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+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-05-15 Sylvestre Ledru <sylvestre@debian.org>
plugin.c (try_init_one_plugin): Fix ressource leaks (CID 726637)
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index 20e0dd6..2813394 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -1227,7 +1227,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)
@@ -1574,7 +1574,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;
}