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.

From-SVN: r249522

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ae7e2d980bfd9c024a17d58ab328fec3c04f5979..bfe0a4d45ec8cc47cdc882f89ab838d31f304573 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+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

diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index 0332b3ec616e35e0307dbf731f817ab91c86d93d..9853c4a499c2d7aaa7cb21d855f45f3e3a1b8210 100644 (file)
--- 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;
                  }