Backport r248089

2017-06-22  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2017-05-16  Martin Liska  <mliska@suse.cz>

	PR ipa/79850.
	* ipa-devirt.c (odr_types_equivalent_p): Fix typo.

From-SVN: r249535

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1f31bb493d3119da21217e211fa436e5d4b056af..5f67c7719a3b2ccf96259834fa1ef983c69753c6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-06-22  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2017-05-16  Martin Liska  <mliska@suse.cz>
+
+       PR ipa/79850.
+       * ipa-devirt.c (odr_types_equivalent_p): Fix typo.
+
 2017-06-22  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index 08cfa8033f01d83ff9de872e555327f9edec8eba..316f33624bca7701ad4ea393215b66861ba9161c 100644 (file)
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -1459,7 +1459,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;
                  }